diff options
| -rw-r--r-- | odk/CustomTarget_check.mk | 1 | ||||
| -rw-r--r-- | odk/CustomTarget_classes.mk | 11 | ||||
| -rw-r--r-- | odk/CustomTarget_odkcommon.mk | 1 | ||||
| -rw-r--r-- | scp2/source/sdkoo/module_sdkoo.scp | 3 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 9 |
5 files changed, 17 insertions, 8 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 3f06bd43fab9..a5995fc44cd8 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -28,6 +28,7 @@ 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/ref)) \ $(call gb_Package_get_target,odk_bin) \ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ diff --git a/odk/CustomTarget_classes.mk b/odk/CustomTarget_classes.mk index ad59a4af0355..f813bccd203e 100644 --- a/odk/CustomTarget_classes.mk +++ b/odk/CustomTarget_classes.mk @@ -9,6 +9,10 @@ $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/classes)) +$(eval $(call gb_CustomTarget_register_targets,odk/odkcommon/classes,\ + java.done \ +)) + $(eval $(call gb_JavaClassSet_JavaClassSet,loader)) $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ @@ -18,14 +22,9 @@ $(eval $(call gb_JavaClassSet_add_sourcefiles,loader,\ odk/source/com/sun/star/lib/loader/WinRegKeyException \ )) -odkcommon_ZIPLIST += classes/com/sun/star/lib/loader -odkcommon_ZIPDEPS += $(odk_WORKDIR)/classes/java.done - -$(call gb_CustomTarget_get_target,odk/odkcommon/classes): $(odk_WORKDIR)/classes/java.done $(odk_WORKDIR)/classes/java.done: $(call gb_JavaClassSet_get_target,loader) - mkdir -p $(dir $@) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CPY,1) - cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) + cp -a $(call gb_JavaClassSet_get_classdir,loader)/com $(dir $@) && \ touch $@ # vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index c253c2e8b223..627addf29da4 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -14,7 +14,6 @@ odkcommon_ZIPDEPS := $(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon)) $(call gb_CustomTarget_get_target,odk/odkcommon): \ - $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ $(call gb_CustomTarget_get_target,odk/odkcommon/include) diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 94fb3eaa98c5..72502e993816 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -53,5 +53,6 @@ Module gid_Module_Optional_Sdkoo gid_File_Zip_Odkcommon, gid_File_Zip_OdkIdl_udkapi, gid_File_Zip_OdkIdl_offapi, - gid_File_Zip_Odkheaders); + gid_File_Zip_uno_loader_classes + ); End diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index 6d30f133f773..72e74e50fbec 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -268,6 +268,15 @@ File gid_File_Zip_Odkheaders Styles = (FILELIST,USE_INTERNAL_RIGHTS); End +#if defined(SOLAR_JAVA) +File gid_File_Zip_uno_loader_classes + TXT_FILE_BODY; + Dir = gid_Dir_Basis_Sdk; + Name = "uno_loader_classes.zip"; + Styles = (ARCHIVE,USE_INTERNAL_RIGHTS); +End +#endif + #if (!defined(WNT) && !defined( MACOSX) ) Directory gid_Dir_Lib_Sdk Styles = (CREATE); |