Skip to content

C
core
Kaydet (Commit) fa424af2 authored tarafından Michael Stahl's avatar Michael Stahl
Dosyalara gözat
Seçenekler

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
üst 6cf65f96
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 31 deletions
instsetoo_native/util/openoffice.lst.in
Dosyayı görüntüle @ fa424af2
......@@ -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}
}
}
......
odk/Module_odk.mk
Dosyayı görüntüle @ fa424af2
......@@ -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 \
))
......
odk/Package_share_readme.mk
Dosyayı görüntüle @ fa424af2
......@@ -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:
readlicense_oo/Package_readme.mk → odk/Package_share_readme_generated.mk
Dosyayı görüntüle @ fa424af2
......@@ -7,14 +7,13 @@
# 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_Package,odk_share_readme_generated,$(WORKDIR)/CustomTarget/readlicense_oo))
$(eval $(call gb_Package_set_outdir,readlicense_oo_readme_inc,$(OUTDIR)))
$(eval $(call gb_Package_set_outdir,odk_share_readme_generated,$(INSTDIR)))
$(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) \
) \
$(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:
readlicense_oo/Module_readlicense_oo.mk
Dosyayı görüntüle @ fa424af2
......@@ -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 \
......
readlicense_oo/Package_files.mk
Dosyayı görüntüle @ fa424af2
......@@ -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:
readlicense_oo/Package_license.mk
Dosyayı görüntüle @ fa424af2
......@@ -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:
scp2/source/sdkoo/sdkoo.scp
Dosyayı görüntüle @ fa424af2
......@@ -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;
......
solenv/gbuild/platform/IOS_ARM_GCC.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
solenv/gbuild/platform/com_MSC_class.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
solenv/gbuild/platform/macosx.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
solenv/gbuild/platform/mingw.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
solenv/gbuild/platform/solaris.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
solenv/gbuild/platform/unxgcc.mk
Dosyayı görüntüle @ fa424af2
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment