summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--odk/Module_odk.mk1
-rw-r--r--odk/Package_lib.mk10
-rw-r--r--odk/Package_share_readme.mk20
-rw-r--r--readlicense_oo/CustomTarget_readme.mk29
-rw-r--r--readlicense_oo/Module_readlicense_oo.mk9
-rw-r--r--readlicense_oo/Package_files.mk1
-rw-r--r--readlicense_oo/Package_license.mk1
-rw-r--r--scp2/source/sdkoo/sdkoo.scp132
-rw-r--r--solenv/gbuild/platform/com_GCC_defs.mk2
-rw-r--r--solenv/gbuild/platform/windows.mk3
10 files changed, 59 insertions, 149 deletions
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 6908f2c05eaa..ccbb93f86a1e 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,odk,\
Package_odk_headers_generated \
Package_settings \
Package_settings_generated \
+ Package_share_readme \
PackageSet_odk_headers \
))
diff --git a/odk/Package_lib.mk b/odk/Package_lib.mk
index 4a3199cc40cf..d1b5360c14b2 100644
--- a/odk/Package_lib.mk
+++ b/odk/Package_lib.mk
@@ -25,4 +25,14 @@ $(eval $(call gb_Package_add_files,odk_lib,$(gb_Package_SDKDIRNAME)/lib,\
$(if $(filter LINUX,$(OS)),$(notdir $(call gb_StaticLibrary_get_target,salcpprt))) \
))
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
+define odk_add_sybolic_link
+$(call gb_Package_add_symbolic_link,odk_lib,$(gb_Package_SDKDIRNAME)/lib/$(1),../../ure-link/lib/$(1).3)
+
+endef
+
+$(foreach lib,cppu cppuhelper purpenvhelper sal salhelper,\
+$(eval $(call odk_add_sybolic_link,$(notdir $(call gb_Library_get_target,$(lib))))))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
new file mode 100644
index 000000000000..5128d6ba6409
--- /dev/null
+++ b/odk/Package_share_readme.mk
@@ -0,0 +1,20 @@
+# -*- 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,$(OUTDIR)/bin))
+
+$(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,odk_share_readme,$(gb_Package_SDKDIRNAME)/share/readme,\
+ LICENSE.html \
+ osl/$(gb_LICENSE) \
+ osl/$(call gb_README,en-US) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/CustomTarget_readme.mk b/readlicense_oo/CustomTarget_readme.mk
index 13b731ef340f..a16beccf3580 100644
--- a/readlicense_oo/CustomTarget_readme.mk
+++ b/readlicense_oo/CustomTarget_readme.mk
@@ -15,15 +15,8 @@ readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/readme)
# what we need here is: gb_WITH_LANG_OR_DEFAULT ;-)
readlicense_oo_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
-ifneq ($(OS),WNT)
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/README_$(lang))
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/README_%
-else
-readlicense_oo_READMEs := $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/readme_$(lang).txt)
-readlicense_oo_README_PATTERN := $(readlicense_oo_DIR)/readme_%.txt
-endif
-
-$(call gb_CustomTarget_get_target,readlicense_oo/readme) : $(readlicense_oo_READMEs)
+$(call gb_CustomTarget_get_target,readlicense_oo/readme) : \
+ $(foreach lang,$(readlicense_oo_LANGS),$(readlicense_oo_DIR)/$(call gb_README,$(lang)))
ifeq ($(strip $(gb_WITH_LANG)),)
readlicense_oo_README_XRM := $(SRCDIR)/readlicense_oo/docs/readme.xrm
@@ -48,7 +41,11 @@ $(readlicense_oo_DIR)/readme.xrm : \
endif
-$(readlicense_oo_README_PATTERN) : \
+readlicense_oo_README_SED := \
+ -e 's,$${PRODUCTNAME},LibreOffice,g' \
+ -e 's,$${PRODUCTVERSION},$(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR),g' \
+
+$(readlicense_oo_DIR)/$(call gb_README,%) : \
$(SRCDIR)/readlicense_oo/docs/readme.xsl \
$(readlicense_oo_README_XRM) \
| $(readlicense_oo_DIR)/.dir \
@@ -62,13 +59,13 @@ $(readlicense_oo_README_PATTERN) : \
--stringparam os1 $(OS) \
--stringparam type text \
$< \
- $(readlicense_oo_README_XRM) && \
- $(if $(filter WNT,$(OS)) \
- ,$(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp && \
- mv $@.tmp $@ && \
- rm $@.out \
- ,mv $@.out $@ \
+ $(readlicense_oo_README_XRM) \
+ $(if $(filter WNT,$(OS)), \
+ && $(gb_AWK) 'sub("$$","\r")' $@.out > $@.tmp \
+ && mv $@.tmp $@.out \
) \
+ && sed $(readlicense_oo_README_SED) $@.out > $@ \
+ && rm $@.out \
)
# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 6cd804e1f860..89f5ae3feff6 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -10,12 +10,15 @@
$(eval $(call gb_Module_Module,readlicense_oo))
$(eval $(call gb_Module_add_targets,readlicense_oo,\
- CustomTarget_license \
CustomTarget_readme \
Package_files \
- Package_license \
Package_readme \
))
-
+ifeq (WNT,$(OS))
+$(eval $(call gb_Module_add_targets,readlicense_oo,\
+ CustomTarget_license \
+ Package_license \
+))
+endif
# vim:set noet sw=4 ts=4:
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index f3f146b7f7a2..ad35b593bac3 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo))
# 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,bin/ure/LICENSE,txt/license.txt))
$(eval $(call gb_Package_add_file,readlicense_oo_files,bin/NOTICE,txt/NOTICE))
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index cdc3b15dc758..9b460d94f8fb 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -10,6 +10,5 @@
$(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/osl/license.txt,license.txt))
-$(eval $(call gb_Package_add_file,readlicense_oo_license,bin/ure/license.txt,license.txt))
# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 83be8fee1605..6e3d58d8dff3 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -29,82 +29,17 @@ Installation gid_Installation_Sdk
#endif
End
-#if defined MACOSX
-
-Directory gid_Dir_Basis_Sdk
- ParentID = PREDEFINED_PROGDIR;
- DosName = "LibreOffice${PRODUCTVERSION}_SDK";
-End
-
-#elif defined WNT
-
-Directory gid_Dir_Sdkoo_Root
- ParentID = PREDEFINED_PROGDIR;
- HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
- Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
-End
-
-Directory gid_Dir_Basis_Sdk
- ParentID = gid_Dir_Sdkoo_Root;
- DosName = "sdk";
-End
-
-#else
-
-Directory gid_Dir_Basis_Sdk
- ParentID = PREDEFINED_PROGDIR;
- DosName = "sdk";
-End
-
-#endif
-
-Directory gid_Dir_Share_Sdk
- ParentID = gid_Dir_Basis_Sdk;
- DosName = "share";
-End
-
-Directory gid_Dir_Share_Readme_Sdk
- ParentID = gid_Dir_Share_Sdk;
- DosName = "readme";
-End
-
-
Module gid_Module_Root_SDK
Name = "sdkoo";
Description = "sdkoo";
PackageInfo = "packinfo_sdkoo.txt";
End
-
-File gid_File_Txt_License
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Readme_Sdk;
- #ifdef UNX
- Name = "LICENSE";
- #endif
- #ifdef WNT
- Name = "license.txt";
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Html_License
+File gid_File_Pakage_odk_share_readme
TXT_FILE_BODY;
- Dir = gid_Dir_Share_Readme_Sdk;
- Name = "LICENSE.html";
- Styles = (PACKED, SCPZIP_REPLACE);
-End
-
-File gid_File_Txt_Readme
- TXT_FILE_BODY;
- Dir = gid_Dir_Share_Readme_Sdk;
- #ifdef UNX
- Name = "README_en-US";
- #endif
- #ifdef WNT
- Name = "readme_en-US.txt";
- #endif
- Styles = (PACKED, SCPZIP_REPLACE);
+ Dir = FILELIST_SDK_DIR;
+ Name = "odk_share_readme.filelist";
+ Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
File gid_File_Package_odk_bin
@@ -253,62 +188,3 @@ File gid_File_Zip_uno_loader_classes
Styles = (FILELIST,USE_INTERNAL_RIGHTS);
End
#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Directory gid_Dir_Lib_Sdk
- Styles = (CREATE);
- ParentID = gid_Dir_Basis_Sdk;
- DosName = "lib";
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Sal_Link_Sdk
- BIN_FILE_BODY;
- Styles = ();
- Name = SCP2_URE_DL_UNO_NORMAL("sal");
- Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("sal", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Salhelper_Link_Sdk
- BIN_FILE_BODY;
- Styles = ();
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("salhelper");
- Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("salhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppu_Link_Sdk
- BIN_FILE_BODY;
- Styles = ();
- Name = SCP2_URE_DL_UNO_NORMAL("cppu");
- Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_VER("cppu", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Cppuhelper_Link_Sdk
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("cppuhelper");
- Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("cppuhelper", "3");
-End
-#endif
-
-#if (!defined(WNT) && !defined( MACOSX) )
-Unixlink gid_Unixlink_Purpenvhelper_Link_Sdk
- BIN_FILE_BODY;
- Styles = ();
- Name = SCP2_URE_DL_UNO_COMID_NORMAL("purpenvhelper");
- Dir = gid_Dir_Lib_Sdk;
- Target = "../../ure-link/lib/" SCP2_URE_DL_UNO_COMID_VER("purpenvhelper", "3");
-End
-#endif
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index c9adf88b237f..327d847ddc66 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -11,6 +11,8 @@ gb_AWK := awk
gb_YACC := bison
gb_CLASSPATHSEP := :
+gb_LICENSE := LICENSE
+gb_README = README_$(1)
# use CC/CXX if they are nondefaults
ifneq ($(origin CC),default)
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 6eb84ed7076c..6e21aa169d20 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -8,6 +8,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
+gb_LICENSE := license.txt
+gb_README = readme_$(1).txt
+
gb_Helper_get_rcfile = $(1).ini
gb_Helper_LIBRARY_PATH_VAR := PATH
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 08:24:49 +0000