diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-23 19:53:09 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-24 15:56:09 +0200 |
| commit | 99fb1839ef1679bc2904ade216f8c5ebb5c6989a (patch) | |
| tree | bd0a756e065bd6df1ccb89e0abdec53df33b4fd3 /odk | |
| parent | d7186fe43618eeb9082c34a65ccb303f7bbc770d (diff) | |
only put uno loader classes into one zip
These are put into uno_loader_classes.zip, which is then not used at
all, and odkcommon.zip, which is used for creation of install sets.
Seriously?!
Change-Id: I28b5bc73857cf524fb12f7918acd2891ff12d166
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 1 | ||||
| -rw-r--r-- | odk/CustomTarget_classes.mk | 11 | ||||
| -rw-r--r-- | odk/CustomTarget_odkcommon.mk | 1 |
3 files changed, 6 insertions, 7 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) |