diff options
| -rw-r--r-- | odk/CustomTarget_check.mk | 1 | ||||
| -rw-r--r-- | odk/CustomTarget_cli.mk | 29 | ||||
| -rw-r--r-- | odk/CustomTarget_odkcommon.mk | 3 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 | ||||
| -rw-r--r-- | odk/Package_cli.mk | 22 | ||||
| -rw-r--r-- | scp2/source/sdkoo/module_sdkoo.scp | 1 | ||||
| -rw-r--r-- | scp2/source/sdkoo/sdkoo.scp | 9 |
7 files changed, 35 insertions, 32 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 3f153f77c0dc..c0046cd64c8e 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_Package_get_target,odk_bin) \ + $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_cli)) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_CustomTarget_get_target,odk/odkcommon) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) diff --git a/odk/CustomTarget_cli.mk b/odk/CustomTarget_cli.mk deleted file mode 100644 index 88f26251c332..000000000000 --- a/odk/CustomTarget_cli.mk +++ /dev/null @@ -1,29 +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_CustomTarget_CustomTarget,odk/odkcommon/cli)) - -odk_CLILIST := cli_basetypes.dll \ - cli_uretypes.dll \ - cli_oootypes.dll \ - cli_ure.dll \ - cli_cppuhelper.dll - -define odk_cli -odkcommon_ZIPLIST += cli/$(1) -$(call gb_CustomTarget_get_target,odk/odkcommon/cli): $(odk_WORKDIR)/cli/$(1) -$(odk_WORKDIR)/cli/$(1): $(call gb_CliAssembly_get_target,$(1)) - mkdir -p $$(dir $$@) - $$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1) - cp $$< $$@ -endef - -$(foreach cli,$(odk_CLILIST),$(eval $(call odk_cli,$(cli)))) - -# vim: set noet sw=4 ts=4: diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk index b6cc3d242926..4e903a1e2d1e 100644 --- a/odk/CustomTarget_odkcommon.mk +++ b/odk/CustomTarget_odkcommon.mk @@ -21,8 +21,7 @@ $(call gb_CustomTarget_get_target,odk/odkcommon): \ $(call gb_CustomTarget_get_target,odk/odkcommon/classes) \ $(call gb_CustomTarget_get_target,odk/odkcommon/lib) \ $(call gb_CustomTarget_get_target,odk/odkcommon/idl) \ - $(call gb_CustomTarget_get_target,odk/odkcommon/include) \ - $(if $(filter MSC,$(COM)),$(call gb_CustomTarget_get_target,odk/odkcommon/cli)) + $(call gb_CustomTarget_get_target,odk/odkcommon/include) ifeq ($(OS),WNT) odk_CONFIGLIST := cfgWin.js \ diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 86778a455f75..a7ccf52fbb23 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Module_Module,odk)) $(eval $(call gb_Module_add_targets,odk,\ CustomTarget_odkcommon \ - $(if $(filter WNT,$(OS)),CustomTarget_cli) \ + $(if $(filter WNT,$(OS)),Package_cli) \ $(if $(DOXYGEN),CustomTarget_doxygen) \ CustomTarget_check \ CustomTarget_lib \ diff --git a/odk/Package_cli.mk b/odk/Package_cli.mk new file mode 100644 index 000000000000..bbb3c859abdd --- /dev/null +++ b/odk/Package_cli.mk @@ -0,0 +1,22 @@ +# -*- 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_cli,$(OUTDIR)/bin)) + +$(eval $(call gb_Package_set_outdir,odk_cli,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_cli,$(gb_Package_SDKDIRNAME)/cli,\ + cli_basetypes.dll \ + cli_cppuhelper.dll \ + cli_oootypes.dll \ + cli_ure.dll \ + cli_uretypes.dll \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/scp2/source/sdkoo/module_sdkoo.scp b/scp2/source/sdkoo/module_sdkoo.scp index 24b78c0172c3..28ab105e32c7 100644 --- a/scp2/source/sdkoo/module_sdkoo.scp +++ b/scp2/source/sdkoo/module_sdkoo.scp @@ -35,6 +35,7 @@ Module gid_Module_Optional_Sdkoo Default = NO; Files = ( gid_File_Package_odk_bin, + gid_File_Package_odk_cli, gid_File_Package_odk_macosx, gid_File_Zip_Odkexamples, gid_File_Zip_Odkcommon, diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index d4e0b54d044f..1c7f68fce671 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -123,6 +123,15 @@ File gid_File_Package_odk_bin Styles = (FILELIST,USE_INTERNAL_RIGHTS); End +#if defined(WNT) +File gid_File_Package_odk_cli + TXT_FILE_BODY; + Dir = FILELIST_SDK_DIR; + Name = "odk_cli.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); +End +#endif + #if defined(MACOSX) File gid_File_Package_odk_macosx TXT_FILE_BODY; |