summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/InstallModule.mk37
-rw-r--r--solenv/gbuild/InstallModuleTarget.mk18
-rw-r--r--solenv/gbuild/InstallScript.mk6
-rw-r--r--solenv/gbuild/TargetLocations.mk1
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk5
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_GCC.mk5
-rw-r--r--solenv/gbuild/platform/WNT_INTEL_MSC.mk5
-rw-r--r--solenv/gbuild/platform/macosx.mk5
-rw-r--r--solenv/gbuild/platform/solaris.mk5
-rw-r--r--solenv/gbuild/platform/unxgcc.mk5
10 files changed, 12 insertions, 80 deletions
diff --git a/solenv/gbuild/InstallModule.mk b/solenv/gbuild/InstallModule.mk
index 7ff5a9effff1..cb37a49625c4 100644
--- a/solenv/gbuild/InstallModule.mk
+++ b/solenv/gbuild/InstallModule.mk
@@ -40,23 +40,15 @@ $(call gb_InstallModule_get_clean_target,%) :
define gb_InstallModule_InstallModule
$(call gb_InstallModuleTarget_InstallModuleTarget,$(1))
-$(call gb_Package_Package_internal,$(1)_par,$(call gb_InstallModuleTarget_get_workdir,$(1)))
$(call gb_InstallModule_get_target,$(1)) : $(call gb_InstallModuleTarget_get_target,$(1))
-$(call gb_InstallModule_get_target,$(1)) : $(call gb_Package_get_target,$(1)_par)
$(call gb_InstallModule_get_target,$(1)) :| $(dir $(call gb_InstallModule_get_target,$(1))).dir
$(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_InstallModuleTarget_get_clean_target,$(1))
-$(call gb_InstallModule_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_par)
$$(eval $$(call gb_Module_register_target,$(call gb_InstallModule_get_target,$(1)),$(call gb_InstallModule_get_clean_target,$(1))))
endef
-define gb_InstallModule_set_include
-$(call gb_InstallModuleTarget_set_include,$(1),$(2))
-
-endef
-
define gb_InstallModule_add_defs
$(call gb_InstallModuleTarget_add_defs,$(1),$(2))
@@ -77,52 +69,23 @@ $(call gb_InstallModuleTarget_define_mingw_dll_if_set,$(1),$(2))
endef
-define gb_InstallModule_use_package
-$(call gb_InstallModuleTarget_use_package,$(1),$(2))
-
-endef
-
-define gb_InstallModule_use_packages
-$(call gb_InstallModuleTarget_use_packages,$(1),$(2))
-
-endef
-
-define gb_InstallModule__add_scpfile_impl
-$(call gb_Package_add_file,$(1)_par,par/osl/$(notdir $(2)),$(2))
-
-endef
-
-define gb_InstallModule__add_scpfile
-$(call gb_InstallModule__add_scpfile_impl,$(1),$(dir $(2))$(notdir $(call gb_ScpTarget_get_target,$(2))))
-
-endef
-
-define gb_InstallModule__add_scpfiles
-$(foreach scpfile,$(2),$(call gb_InstallModule__add_scpfile,$(1),$(scpfile)))
-
-endef
-
define gb_InstallModule_add_scpfile
$(call gb_InstallModuleTarget_add_scpfile,$(1),$(2))
-$(call gb_InstallModule__add_scpfile,$(1),$(2))
endef
define gb_InstallModule_add_scpfiles
$(call gb_InstallModuleTarget_add_scpfiles,$(1),$(2))
-$(call gb_InstallModule__add_scpfiles,$(1),$(2))
endef
define gb_InstallModule_add_localized_scpfile
$(call gb_InstallModuleTarget_add_localized_scpfile,$(1),$(2))
-$(call gb_InstallModule__add_scpfile,$(1),$(2))
endef
define gb_InstallModule_add_localized_scpfiles
$(call gb_InstallModuleTarget_add_localized_scpfiles,$(1),$(2))
-$(call gb_InstallModule__add_scpfiles,$(1),$(2))
endef
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 3d7fcd02ac89..379baefb7882 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -212,7 +212,6 @@ $(call gb_Output_announce,SCP:$(2),$(true),DEP,2)
$(call gb_Helper_abbreviate_dirs,\
$(gb_ScpTarget_DEPCOMMAND) \
$(SCPDEFS) $(SCP_DEFS) -DDLLPOSTFIX=$(gb_Library_DLLPOSTFIX) \
- $(SCP_INCLUDE) $(SCP_TEMPLATE_INCLUDE) \
-f $(1) \
-p \
)
@@ -295,18 +294,14 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES :=
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS :=
-$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE :=
+$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := -I$(SRCDIR)/scp2/inc
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_TEMPLATE_INCLUDE :=
+$(call gb_InstallModuleTarget_use_custom_headers,$(1),scp2/macros)
$(call gb_InstallModuleTarget_InstallModuleTarget_platform,$(1))
endef
-define gb_InstallModuleTarget_set_include
-$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := $(2)
-
-endef
-
define gb_InstallModuleTarget_add_defs
$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS += $(2)
@@ -333,13 +328,14 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
endef
-define gb_InstallModuleTarget_use_package
-$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_Package_get_target,$(2))
+define gb_InstallModuleTarget_use_custom_header
+$(call gb_InstallModuleTarget_get_external_target,$(1)) :| $(call gb_CustomTarget_get_target,$(2))
+$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE += -I$(call gb_CustomTarget_get_workdir,$(2)) \
endef
-define gb_InstallModuleTarget_use_packages
-$(foreach package,$(2),$(call gb_InstallModuleTarget_use_package,$(1),$(package)))
+define gb_InstallModuleTarget_use_custom_headers
+$(foreach customtarget,$(2),$(call gb_InstallModuleTarget_use_custom_header,$(1),$(customtarget)))
endef
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 35ea142ca147..c325d4bfa2be 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -36,6 +36,10 @@ define gb_InstallScriptTarget__get_files
$(notdir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module)))))
endef
+define gb_InstallScriptTarget__get_dirs
+$(sort $(dir $(shell cat $(foreach module,$(1),$(call gb_InstallModule_get_filelist,$(module))))))
+endef
+
# Pass first arg if make is running in silent mode, second arg otherwise
define gb_InstallScriptTarget__if_silent
$(if $(findstring s,$(filter-out --%,$(MAKEFLAGS))),$(1),$(2))
@@ -50,7 +54,7 @@ $(call gb_Helper_abbreviate_dirs,\
) && \
$(gb_InstallScriptTarget_COMMAND) \
$(call gb_InstallScriptTarget__if_silent,-q) \
- -i $(OUTDIR)/par/osl \
+ -i $(call gb_InstallScriptTarget__get_dirs,$(SCP_MODULES)) \
-o $(1) \
@@$${RESPONSEFILE} && \
rm -f $${RESPONSEFILE} \
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index a0fa050ca9fb..39c411234f90 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -102,7 +102,6 @@ gb_InstallModule_get_target = $(WORKDIR)/InstallModule/$(1).done
gb_InstallModuleTarget_get_external_target = $(WORKDIR)/InstallModuleTarget/$(1).external
gb_InstallModuleTarget_get_filelist = $(WORKDIR)/InstallModuleTarget/$(1).filelist
gb_InstallModuleTarget_get_target = $(WORKDIR)/InstallModuleTarget/$(1).filelist
-gb_InstallModuleTarget_get_workdir = $(patsubst %/,%,$(dir $(call gb_ScpTarget_get_target,%)))
gb_InstallScriptTarget_get_target = $(WORKDIR)/InstallScriptTarget/$(1)$(gb_InstallScript_EXT)
gb_Jar_get_target = $(WORKDIR)/Jar/$(1).jar
gb_Jar_get_classsetname = Jar/$(1)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 878d9f3650f1..ebe64d124482 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -304,11 +304,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index a682c5f76ad8..f92a278a71a8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -441,11 +441,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 2b9bae7a198e..22999805b1f8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -719,11 +719,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index d2852dfdd289..3d6810bb184b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -416,11 +416,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 993c97e99bde..1ecc970d956a 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -413,11 +413,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 4938d95405f4..e6ed9e327443 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -415,11 +415,6 @@ $(call gb_InstallModuleTarget_add_defs,$(1),\
$(if $(filter TRUE,$(SOLAR_JAVA)),-DSOLAR_JAVA) \
)
-$(call gb_InstallModuleTarget_set_include,$(1),\
- $(SOLARINC) \
- $(SCP_INCLUDE) \
-)
-
endef
# ScpConvertTarget class
generated by cgit (git 2.34.1) at 2025-01-19 17:44:55 +0000