diff options
| author | David Tardon <dtardon@redhat.com> | 2013-06-19 16:14:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-06-19 16:35:47 +0200 |
| commit | 94cf00b065ba9f72455e706e066ced57d31ba0d8 (patch) | |
| tree | 5e3ae71bca59819c7b87cd17fc1134b2bab55a85 /odk | |
| parent | b936dd27904f8688214a2e3ac7e1fd5cdf6a0877 (diff) | |
use GeneratedPackage to deliver uno loader classes
This is a workaround for problems with file names containing $ in
gbuild. And it does not matter much in this case, because the classes
are never used during build, so there is no need to have exact
dependencies.
Change-Id: Ibeb30257a62ed13744dc4fe987830d1e5a4102b0
(cherry picked from commit 41efa1535827b3dfef66ed4ce6c20e85081fe060)
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/GeneratedPackage_uno_loader_classes.mk | 16 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 | ||||
| -rw-r--r-- | odk/Package_uno_loader_classes.mk | 25 |
3 files changed, 17 insertions, 26 deletions
diff --git a/odk/GeneratedPackage_uno_loader_classes.mk b/odk/GeneratedPackage_uno_loader_classes.mk new file mode 100644 index 000000000000..5c3998f1cb4a --- /dev/null +++ b/odk/GeneratedPackage_uno_loader_classes.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_GeneratedPackage_GeneratedPackage,odk_uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/classes))) + +$(eval $(call gb_GeneratedPackage_use_customtarget,odk_uno_loader_classes,odk/classes)) + +$(eval $(call gb_GeneratedPackage_add_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes/com/sun/star/lib/loader,com/sun/star/lib/loader)) + +# vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index f7cc7771d570..87cc7b90c4f1 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -56,9 +56,9 @@ $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ CustomTarget_classes \ CustomTarget_javadoc \ + GeneratedPackage_uno_loader_classes \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ Package_javadoc \ - Package_uno_loader_classes \ Package_unowinreg \ )) endif diff --git a/odk/Package_uno_loader_classes.mk b/odk/Package_uno_loader_classes.mk deleted file mode 100644 index 86e98a2a1244..000000000000 --- a/odk/Package_uno_loader_classes.mk +++ /dev/null @@ -1,25 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,odk_uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/classes))) - -$(eval $(call gb_Package_set_outdir,odk_uno_loader_classes,$(INSTDIR))) - -$(eval $(call gb_Package_add_files_with_dir,odk_uno_loader_classes,$(gb_Package_SDKDIRNAME)/classes,\ - com/sun/star/lib/loader/InstallationFinder$$StreamGobbler.class \ - com/sun/star/lib/loader/InstallationFinder.class \ - com/sun/star/lib/loader/Loader$$CustomURLClassLoader.class \ - com/sun/star/lib/loader/Loader$$Drain.class \ - com/sun/star/lib/loader/Loader$$Drain.class \ - com/sun/star/lib/loader/Loader.class \ - com/sun/star/lib/loader/WinRegKey.class \ - com/sun/star/lib/loader/WinRegKeyException.class \ -)) - -# vim: set noet sw=4 ts=4: |