From 148c7629fc844db690075b9df62677b5e902c9f0 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 30 Apr 2013 15:18:30 +0200 Subject: deliver uno loader classes using filelist Change-Id: I121a4ad5d7cff54b914796142fa7c50006856300 --- odk/CustomTarget_check.mk | 2 +- odk/CustomTarget_classes.mk | 9 ++++++--- odk/Module_odk.mk | 2 +- odk/Package_uno_loader_classes.mk | 25 +++++++++++++++++++++++++ odk/Zip_uno_loader_classes.mk | 20 -------------------- 5 files changed, 33 insertions(+), 25 deletions(-) create mode 100644 odk/Package_uno_loader_classes.mk delete mode 100644 odk/Zip_uno_loader_classes.mk (limited to 'odk') diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 50a124d5a0a6..66605250932a 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,7 +28,6 @@ odk_PLATFORM := $(if $(filter WNT,$(OS)),\ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(SRCDIR)/odk/util/check.pl \ - $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(if $(DOXYGEN),$(call gb_CustomTarget_get_target,odk/odkcommon/docs/cpp)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ @@ -44,6 +43,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ + $(call gb_Package_get_target,odk_uno_loader_classes) \ $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) \ $(call gb_PackageSet_get_target,odk_autodoc) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk index 82f524797aa5..bd07f0ae57e6 100644 --- a/odk/CustomTarget_classes.mk +++ b/odk/CustomTarget_classes.mk @@ -7,9 +7,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/classes)) +$(eval $(call gb_CustomTarget_CustomTarget,odk/classes)) -$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/classes,\ +$(eval $(call gb_CustomTarget_register_targets,odk/classes,\ java.done \ )) @@ -22,7 +22,10 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ odk/source/com/sun/star/lib/loader/WinRegKeyException \ )) -$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes)/java.done: $(call gb_JavaClassSet_get_target,loader) +$(call gb_CustomTarget_get_workdir,odk/classes)/%.class : $(call gb_CustomTarget_get_workdir,odk/classes)/java.done + touch $@ + +$(call gb_CustomTarget_get_workdir,odk/classes)/java.done: $(call gb_JavaClassSet_get_target,loader) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \ touch $@ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 94f8fc1cd13d..aab05397fc62 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -58,8 +58,8 @@ $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_javadoc \ $(if $(filter WNT,$(OS)),Library_unowinreg) \ Package_javadoc \ + Package_uno_loader_classes \ Package_unowinreg \ - Zip_uno_loader_classes \ )) endif diff --git a/odk/Package_uno_loader_classes.mk b/odk/Package_uno_loader_classes.mk new file mode 100644 index 000000000000..86e98a2a1244 --- /dev/null +++ b/odk/Package_uno_loader_classes.mk @@ -0,0 +1,25 @@ +# -*- 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: diff --git a/odk/Zip_uno_loader_classes.mk b/odk/Zip_uno_loader_classes.mk deleted file mode 100644 index 6cf0bf124205..000000000000 --- a/odk/Zip_uno_loader_classes.mk +++ /dev/null @@ -1,20 +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_Zip_Zip,uno_loader_classes,$(call gb_CustomTarget_get_workdir,odk/odkcommon/classes))) - -$(eval $(call gb_Zip_add_commandoptions,uno_loader_classes,-r)) - -$(eval $(call gb_Zip_add_files,uno_loader_classes,\ - com/sun/star/lib/loader \ -)) - -$(call gb_Zip_get_target,uno_loader_classes) : $(call gb_CustomTarget_get_target,odk/odkcommon/classes) - -# vim: set noet sw=4 ts=4: -- cgit v1.2.3