From fa424af27e8fd00528aea6ae4377184557a3a160 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 30 Oct 2013 21:28:09 +0100 Subject: [PATCH] readlicense_oo: stop delivering files to OUTDIR - remove Package_readme, use generated files from WORKDIR via include path - Package_license and Package_files deliver to INSTDIR - split up Package_odk_shared_readme to have extra Package for generated files - gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893 --- instsetoo_native/util/openoffice.lst.in | 4 ++-- odk/Module_odk.mk | 1 + odk/Package_share_readme.mk | 11 +++++++---- odk/Package_share_readme_generated.mk | 19 +++++++++++++++++++ readlicense_oo/Module_readlicense_oo.mk | 2 +- readlicense_oo/Package_files.mk | 13 +++++-------- readlicense_oo/Package_license.mk | 4 +--- readlicense_oo/Package_readme.mk | 20 -------------------- scp2/source/sdkoo/sdkoo.scp | 10 +++++++++- solenv/gbuild/platform/IOS_ARM_GCC.mk | 2 +- solenv/gbuild/platform/com_MSC_class.mk | 2 +- solenv/gbuild/platform/macosx.mk | 2 +- solenv/gbuild/platform/mingw.mk | 2 +- solenv/gbuild/platform/solaris.mk | 2 +- solenv/gbuild/platform/unxgcc.mk | 2 +- 15 files changed, 51 insertions(+), 45 deletions(-) create mode 100644 odk/Package_share_readme_generated.mk delete mode 100644 readlicense_oo/Package_readme.mk diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 68febd52a437..99da91074e6d 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -78,7 +78,7 @@ LibreOffice downloadname LibreOffice_{productversion}_{os}_install_{languages} langpackdownloadname LibreOffice_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOffice_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath} + include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath} } } @@ -131,7 +131,7 @@ LibreOffice_Dev downloadname LibreOfficeDev_{productversion}_{os}_install_{languages} langpackdownloadname LibreOfficeDev_{productversion}_languagepack_{os}_install_{languages} helppackdownloadname LibreOfficeDev_{productversion}_helppack_{os}_install_{languages} - include {solarpath}/bin.{minor}/osl,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath} + include {solarpath}/bin.{minor}/osl,{customtargetpath}/readlicense_oo/readme,{customtargetpath}/sysui/{pkgtype},{customtargetpath}/setup_native/scripts,{solarpath}/bin.{minor},{solarpath}/lib.{minor},{solarpath}/pck.{minor}/openoffice_dev,{solarpath}/pck.{minor},{solarpath}/xml.{minor},{filelistpath}/PackageSet,{filelistpath}/GeneratedPackage,{filelistpath}/Package,{shlxthdlpath},{instdir},{instdir}/ure/lib,{extensionsdir},{packinfopath} } } diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 2fe4b61b7bf9..9ddc400e62c3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_settings \ Package_settings_generated \ Package_share_readme \ + Package_share_readme_generated \ PackageSet_odk_headers \ )) diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk index 79d8e17259c6..a73d1e9170ca 100644 --- a/odk/Package_share_readme.mk +++ b/odk/Package_share_readme.mk @@ -7,14 +7,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin)) +$(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR))) $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR))) $(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\ - LICENSE.html \ - osl/$(gb_LICENSE) \ - osl/$(call gb_README,en-US) \ + readlicense_oo/html/LICENSE.html \ )) +ifneq ($(OS),WNT) +# the stupid thing is renamed, see Package_files.mk +$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/txt/license.txt)) +endif + # vim: set noet sw=4 ts=4: diff --git a/odk/Package_share_readme_generated.mk b/odk/Package_share_readme_generated.mk new file mode 100644 index 000000000000..c7ae0a8a94d2 --- /dev/null +++ b/odk/Package_share_readme_generated.mk @@ -0,0 +1,19 @@ +# -*- 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_share_readme_generated,$(WORKDIR)/CustomTarget/readlicense_oo)) + +$(eval $(call gb_Package_set_outdir,odk_share_readme_generated,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_share_readme_generated,$(SDKDIRNAME)/share/readme,\ + $(if $(filter WNT,$(OS)),license/license.txt) \ + readme/$(call gb_README,en-US) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk index 89f5ae3feff6..3170e138aba5 100644 --- a/readlicense_oo/Module_readlicense_oo.mk +++ b/readlicense_oo/Module_readlicense_oo.mk @@ -12,8 +12,8 @@ $(eval $(call gb_Module_Module,readlicense_oo)) $(eval $(call gb_Module_add_targets,readlicense_oo,\ CustomTarget_readme \ Package_files \ - Package_readme \ )) + ifeq (WNT,$(OS)) $(eval $(call gb_Module_add_targets,readlicense_oo,\ CustomTarget_license \ diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 19cf8fd68c29..74fac2759b56 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -9,18 +9,15 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo)) -$(eval $(call gb_Package_set_outdir,readlicense_oo_files,$(OUTDIR))) - # LICENSE (upper case) is copied without EOL conversion from license.txt # license.txt is converted, prior to copy, see Package_license.mk -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE,txt/license.txt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,txt/license.txt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,txt/NOTICE)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/osl/LICENSE.odt,odt/LICENSE.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.odt,odt/LICENSE.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/CREDITS.odt,odt/CREDITS.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.odt,odt/LICENSE.odt)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,CREDITS.odt,odt/CREDITS.odt)) -$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/LICENSE.html,html/LICENSE.html)) +$(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE.html,html/LICENSE.html)) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk index 877db2303a6b..7dd1d8c148c3 100644 --- a/readlicense_oo/Package_license.mk +++ b/readlicense_oo/Package_license.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license))) -$(eval $(call gb_Package_set_outdir,readlicense_oo_license,$(OUTDIR))) - -$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt)) +$(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt)) # vim: set noet sw=4 ts=4: diff --git a/readlicense_oo/Package_readme.mk b/readlicense_oo/Package_readme.mk deleted file mode 100644 index 1e30ba364709..000000000000 --- a/readlicense_oo/Package_readme.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_Package_Package,readlicense_oo_readme_inc,$(call gb_CustomTarget_get_workdir,readlicense_oo/readme))) - -$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR))) - -$(eval $(call gb_Package_add_files,readlicense_oo_readme_inc,bin/osl,\ - $(foreach lang,en-US $(filter-out en-US,$(gb_WITH_LANG)),\ - $(if $(filter-out WNT,$(OS)),README_$(lang),readme_$(lang).txt) \ - ) \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp index e9ba29c89e56..c03b664c2ae4 100644 --- a/scp2/source/sdkoo/sdkoo.scp +++ b/scp2/source/sdkoo/sdkoo.scp @@ -66,13 +66,21 @@ Module gid_Module_Root_SDK Files = (auto_sdk_ALL); End -File gid_File_Pakage_odk_share_readme +File gid_File_Package_odk_share_readme TXT_FILE_BODY; Dir = FILELIST_SDK_DIR; Name = "odk_share_readme.filelist"; Styles = (FILELIST,USE_INTERNAL_RIGHTS); End +File gid_File_Package_odk_share_readme_generated + TXT_FILE_BODY; + Dir = FILELIST_SDK_DIR; + Name = "odk_share_readme_generated.filelist"; + Styles = (FILELIST,USE_INTERNAL_RIGHTS); +End + + #if defined(WNT) File gid_File_Package_odk_cli TXT_FILE_BODY; diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk index 96cfb5dbd7c3..7d4fc6c086fa 100644 --- a/solenv/gbuild/platform/IOS_ARM_GCC.mk +++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk @@ -261,7 +261,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 55776b3be5ec..11aadc68547e 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -544,7 +544,7 @@ gb_CliAssemblyTarget_get_dll = $(call gb_Library__get_dir_for_layer,NONE)/$(1)$( # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt # UnpackedTarget class diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 0389eedafdb1..8ccec37640f8 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -350,7 +350,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk index 29ac9c4f1df8..fb00181a717e 100644 --- a/solenv/gbuild/platform/mingw.mk +++ b/solenv/gbuild/platform/mingw.mk @@ -357,7 +357,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/license.txt +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/license.txt # UnpackedTarget class diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 295fce653b39..2115a4a90082 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -374,7 +374,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 81137a3d103c..75d5d21ab4d6 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -375,7 +375,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(OUTDIR)/bin/osl/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE # UnpackedTarget class