[Libreoffice-commits] core.git: 10 commits - compilerplugins/Makefile config_host.mk.in configure.ac external/firebird external/icu instsetoo_native/CustomTarget_install.mk Makefile.gbuild Makefile.in nss/ExternalProject_nss.mk postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk redland/ExternalProject_rasqal.mk redland/ExternalProject_redland.mk solenv/bin solenv/gbuild sysui/CustomTarget_share.mk
Michael Stahl
mstahl at redhat.com
Sat Nov 2 22:13:35 CET 2013
Makefile.gbuild | 2
Makefile.in | 6 -
compilerplugins/Makefile | 2
config_host.mk.in | 1
configure.ac | 9 +-
external/firebird/ExternalProject_firebird.mk | 2
external/icu/ExternalProject_icu.mk | 2
instsetoo_native/CustomTarget_install.mk | 2
nss/ExternalProject_nss.mk | 2
postprocess/CustomTarget_images.mk | 7 +-
postprocess/CustomTarget_registry.mk | 4 -
redland/ExternalProject_rasqal.mk | 2
redland/ExternalProject_redland.mk | 2
solenv/bin/callcatcher.Makefile | 2
solenv/bin/install-gdb-printers | 2
solenv/bin/make_installer.pl | 2
solenv/bin/modules/installer/parameter.pm | 2
solenv/bin/ooinstall | 4 -
solenv/bin/par2script.pl | 2
solenv/bin/pre2par.pl | 2
solenv/gbuild/AllLangResTarget.mk | 2
solenv/gbuild/CliAssembly.mk | 2
solenv/gbuild/ComponentTarget.mk | 2
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/Executable.mk | 2
solenv/gbuild/Gallery.mk | 2
solenv/gbuild/InstallModuleTarget.mk | 2
solenv/gbuild/InstallScript.mk | 2
solenv/gbuild/Library.mk | 21 +-----
solenv/gbuild/LinkTarget.mk | 81 -------------------------
solenv/gbuild/Rdb.mk | 3
solenv/gbuild/TargetLocations.mk | 43 ++++---------
solenv/gbuild/UnoApiTarget.mk | 6 -
solenv/gbuild/extensions/pre_SharedLangList.mk | 2
solenv/gbuild/partial_build.mk | 4 -
solenv/gbuild/platform/macosx.mk | 4 -
sysui/CustomTarget_share.mk | 2
37 files changed, 73 insertions(+), 168 deletions(-)
New commits:
commit d800a25568643fd1c7fb634cc9fbfcbd255d6162
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 14:17:17 2013 +0100
gbuild: Library: remove gb_Library__get_final_target
... use gb_Library_get_exports_target instead, which is already a
"final" target for Library.
Change-Id: I5b8a708ba97e351ef383dcc64ead4ab9ea8705c7
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 71ed8b5..a0c3e70 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -35,13 +35,6 @@ gb_Library_LAYER_DIRS := \
OXT:$(WORKDIR)/LinkTarget/ExtensionLibrary \
NONE:$(gb_Library_DLLDIR) \
-$(dir $(call gb_Library__get_final_target,%)).dir :
- $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-
-# doesn't do anything, just used for hooking up component target
-$(call gb_Library__get_final_target,%) :
- touch $@
-
# EVIL: gb_StaticLibrary and gb_Library need the same deliver rule because they are indistinguishable on windows
.PHONY : $(WORKDIR)/Clean/Library/%
$(WORKDIR)/Clean/Library/% :
@@ -91,8 +84,6 @@ $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS))
$(call gb_LinkTarget_add_defs,$(2),\
$(gb_Library_DEFS) \
)
-$(call gb_Library__get_final_target,$(1)) : $(call gb_Library_get_target,$(1))
-$(call gb_Library__get_final_target,$(1)) :| $(dir $(call gb_Library__get_final_target,$(1))).dir
$(call gb_Library_get_exports_target,$(1)) : $(call gb_Library_get_target,$(1))
$(call gb_LinkTarget_get_headers_target,$(2)) : \
| $(dir $(call gb_Library_get_ilib_target,$(1))).dir
@@ -100,9 +91,9 @@ $(call gb_Library_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target
$(call gb_Library_get_clean_target,$(1)) : AUXTARGETS :=
$(call gb_Library_Library_platform,$(1),$(2),$(call gb_Library_get_ilib_target,$(1)))
-$$(eval $$(call gb_Module_register_target,$(call gb_Library__get_final_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Library_get_exports_target,$(1)),$(call gb_Library_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library__get_final_target,$(1)))
+$(call gb_Helper_make_userfriendly_targets,$(1),Library,$(call gb_Library_get_exports_target,$(1)))
endef
@@ -138,8 +129,9 @@ endef
# The dependency from workdir component target to outdir library should ensure
# that gb_CppunitTest_use_component can transitively depend on the library.
-# But the component target also must be delivered, so a new phony target
-# gb_Library__get_final_target has been invented for that purpose...
+# But the component target also must be delivered; use the target
+# gb_Library_get_exports_target for that purpose, since it is already
+# the "final" target of the Library...
define gb_Library_set_componentfile
$(call gb_Library_get_target,$(gb_Library__get_name)) : \
COMPONENT := $$(if $$(and $$(COMPONENT),$(filter-out $(gb_MERGEDLIBS) $(gb_URELIBS),$(1))),\
@@ -147,7 +139,7 @@ $(call gb_Library_get_target,$(gb_Library__get_name)) : \
$(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
-$(call gb_Library__get_final_target,$(gb_Library__get_name)) : \
+$(call gb_Library_get_exports_target,$(gb_Library__get_name)) :| \
$(call gb_ComponentTarget_get_target,$(2))
$(call gb_ComponentTarget_get_target,$(2)) :| \
$(call gb_Library_get_target,$(gb_Library__get_name))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 635145b..58b4f6b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -207,8 +207,6 @@ define gb_Library_get_versionlink_target
$(INSTDIR)/$(SDKDIRNAME)/lib/$(basename $(call gb_Library_get_filename,$(1)))
endef
-gb_Library__get_final_target = $(WORKDIR)/Dummy/$(1)
-
define gb_Library_get_headers_target
$(patsubst $(1):%,$(WORKDIR)/Headers/Library/%,$(filter $(1):%,$(gb_Library_FILENAMES)))
endef
commit 463ee0c0ac3753dee0bd155461f0288b3c12c7ba
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 14:02:02 2013 +0100
gbuild: Executable: remove pointless indirection here too
gb_Executable__get_linktarget_target, gb_Executable_get_install_target
and gb_Executable_get_install_target_for_build
Change-Id: I1b0397c6982e885cd4834c2001264b1f6ae0a99c
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 328b639..974e1b3 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -54,8 +54,6 @@ gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb
gb_Executable__get_dir_for_layer_for_build = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS_FOR_BUILD)))
gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
gb_Executable__get_dir_for_exe_for_build = $(call gb_Executable__get_dir_for_layer_for_build,$(call gb_Executable_get_layer,$(1)))
-gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
-gb_Executable_get_install_target_for_build = $(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1))
define gb_Executable_Executable
$(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 07408d2..635145b 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -30,17 +30,6 @@ gb_PackagePart_get_destinations = \
# kind of lame but with just 3 of these why bother with registration etc.
gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
-# instdir target patterns
-
-gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
-
-ifneq ($(CROSS_COMPILING),)
-# Can we assume this is used only for executables registered for "NONE"?
-gb_Executable_get_target_for_build = $(call gb_Executable_get_install_target_for_build,$(1))
-else
-gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
-endif
-
# workdir target patterns
gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
@@ -365,11 +354,19 @@ endef
define gb_Executable__get_workdir_linktargetname
Executable/$(call gb_Executable_get_filename,$(1))
endef
-define gb_Executable__get_linktarget_target
-$(call gb_Executable_get_install_target,$(1))
+define gb_Executable_get_target
+$(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
endef
+ifneq ($(CROSS_COMPILING),)
+# Can we assume this is used only for executables registered for "NONE"?
+define gb_Executable_get_target_for_build
+$(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1))
+endef
+else
+gb_Executable_get_target_for_build = $(gb_Executable_get_target)
+endif # CROSS_COMPILING
define gb_Executable_get_linktarget
-$(call gb_Executable__get_workdir_linktargetname,$(1))<>$(call gb_Executable__get_linktarget_target,$(1))
+$(call gb_Executable__get_workdir_linktargetname,$(1))<>$(call gb_Executable_get_target,$(1))
endef
define gb_Library__get_workdir_linktargetname
commit 43adc0cf01af3bb304baaeed9d5224a890edb407
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 13:49:30 2013 +0100
gbuild: StaticLibrary: remove gb_StaticLibrary__get_linktarget_target
Change-Id: I82ddbb3c82fa5f92e27a938a65a282ed67826a1e
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index ad3655d..07408d2 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,9 +41,6 @@ else
gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
endif
-gb_StaticLibrary_get_target = $(gb_StaticLibrary__get_linktarget_target)
-
-
# workdir target patterns
gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
@@ -389,12 +386,12 @@ endef
define gb_StaticLibrary__get_workdir_linktargetname
StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))
endef
-define gb_StaticLibrary__get_linktarget_target
+define gb_StaticLibrary_get_target
$(WORKDIR)/LinkTarget/$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))
endef
# this returns a tuple of both the linktargetname, and the target file
define gb_StaticLibrary_get_linktarget
-$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))<>$(call gb_StaticLibrary__get_linktarget_target,$(1))
+$(call gb_StaticLibrary__get_workdir_linktargetname,$(1))<>$(call gb_StaticLibrary_get_target,$(1))
endef
define gb_CppunitTest__get_workdir_linktargetname
commit a2649f4d4de723452bfbb959e12278e6fb1b019a
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 13:44:05 2013 +0100
gbuild: Library: remove pointless functions
gb_Library_get_install_target and gb_Library__get_linktarget_target
Change-Id: I446e642fb43cf9804900b99b32dcc4c621dcb1c7
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index ba5839c..71ed8b5 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -51,7 +51,6 @@ $(WORKDIR)/Clean/Library/% :
gb_Library__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER_DIRS)))
gb_Library_get_instdir = $(call gb_Library__get_dir_for_layer,$(call gb_Library_get_layer,$(1)))
-gb_Library_get_install_target = $(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
gb_Library_get_ilib_target = $(if $(filter $(1),$(gb_Library_RTVERLIBS) $(gb_Library_UNOVERLIBS)),$(INSTDIR)/$(SDKDIRNAME)/lib/$(call gb_Library_get_ilibfilename,$(1)),$(gb_Library_DLLDIR)/$(call gb_Library_get_ilibfilename,$(1)))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 01db721..ad3655d 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -41,9 +41,6 @@ else
gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
endif
-# FIXME: cleanup?
-gb_Library_get_target = $(gb_Library__get_linktarget_target)
-
gb_StaticLibrary_get_target = $(gb_StaticLibrary__get_linktarget_target)
@@ -381,12 +378,12 @@ endef
define gb_Library__get_workdir_linktargetname
Library/$(call gb_Library_get_filename,$(1))
endef
-define gb_Library__get_linktarget_target
-$(call gb_Library_get_install_target,$(1))
+define gb_Library_get_target
+$(call gb_Library_get_instdir,$(1))/$(call gb_Library_get_runtime_filename,$(1))
endef
# this returns a tuple of both the linktargetname, and the target file
define gb_Library_get_linktarget
-$(call gb_Library__get_workdir_linktargetname,$(1))<>$(call gb_Library__get_linktarget_target,$(1))
+$(call gb_Library__get_workdir_linktargetname,$(1))<>$(call gb_Library_get_target,$(1))
endef
define gb_StaticLibrary__get_workdir_linktargetname
commit 8ec6c54a8c57dbc6f217a0fc16d992716b9c0555
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 13:05:25 2013 +0100
gbuild: LinkTarget: remove unnecessary variables on dep_target
Since commit 8b5a984d45005d3df1c89eae897d6e04612625d8 it is no longer
the case that objects get build only via a dependency from
Linktarget's dep_target, relying on the variables set on dep_target;
now objects only get built via dependency from LinkTarget itself.
So there is no need to set these variables on dep_target any more.
Change-Id: Id0a831342ae6cfcff3bebe7010ece923f0262703
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 829cbfa..d804824 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -605,21 +605,6 @@ $(call gb_LinkTarget_get_dep_target,$(1)) : ASMOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS :=
$(call gb_LinkTarget_get_dep_target,$(1)) : YACCOBJECTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_YACCFLAGS := $$(gb_LinkTarget_YYACFLAGS) $(YACCFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
-$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_NAME :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : EXTRAOBJECTLISTS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : VISIBILITY :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS :=
-$(call gb_LinkTarget_get_dep_target,$(1)) : SOVERSIONSCRIPT :=
endif
gb_LinkTarget_CXX_SUFFIX_$(call gb_LinkTarget__get_workdir_linktargetname,$(1)) := cxx
@@ -640,10 +625,6 @@ endef
define gb_LinkTarget_add_defs
$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS += $(2)
-endif
endef
define gb_LinkTarget_set_defs
@@ -656,10 +637,6 @@ endef
# call gb_LinkTarget_add_cflags,linktarget,cflags
define gb_LinkTarget_add_cflags
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CFLAGS_APPEND += $(2)
-endif
-
endef
define gb_LinkTarget_set_cflags
@@ -673,10 +650,6 @@ endef
define gb_LinkTarget_add_cxxflags
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS += $(2)
-endif
endef
define gb_LinkTarget_set_cxxflags
@@ -688,9 +661,6 @@ endef
# call gb_LinkTarget_add_objcxxflags,linktarget,objcxxflags
define gb_LinkTarget_add_objcxxflags
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCXXFLAGS_APPEND += $(2)
-endif
endef
define gb_LinkTarget_set_objcxxflags
@@ -708,18 +678,12 @@ endef
# call gb_LinkTarget_add_objcflags,linktarget,objcflags
define gb_LinkTarget_add_objcflags
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : T_OBJCFLAGS_APPEND += $(2)
-endif
endef
# call gb_LinkTarget__add_include,linktarget,includes
define gb_LinkTarget__add_include
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(2)
-endif
endef
@@ -735,9 +699,6 @@ define gb_LinkTarget_set_include
$(call gb_LinkTarget__check_srcdir_paths,$(1),\
$(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(WORKDIR)/%,$(2)))))
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $(2)
-endif
endef
@@ -1244,15 +1205,13 @@ endef
# call gb_LinkTarget_set_targettype,linktarget,targettype
define gb_LinkTarget_set_targettype
-$(call gb_LinkTarget_get_target,$(1)) \
-$(call gb_LinkTarget_get_dep_target,$(1)) : TARGETTYPE := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE := $(2)
endef
# call gb_LinkTarget_set_x64,linktarget,boolean
define gb_LinkTarget_set_x64
-$(call gb_LinkTarget_get_target,$(1)) \
-$(call gb_LinkTarget_get_dep_target,$(1)) : LIBRARY_X64 := $(2)
+$(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 := $(2)
endef
@@ -1347,8 +1306,6 @@ $(call gb_PrecompiledHeader_get_timestamp,$(call gb_LinkTarget__get_workdir_link
ifeq ($(gb_FULLDEPS),$(true))
-include $(call gb_PrecompiledHeader_get_dep_target,$(3))
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_DEFS := $$(DEFS)
-$(call gb_LinkTarget_get_dep_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4))
endif
endef
@@ -1419,9 +1376,6 @@ gb_LinkTarget_use_externals = \
# call gb_LinkTarget_set_visibility_default,linktarget
define gb_LinkTarget_set_visibility_default
$(call gb_LinkTarget_get_target,$(1)) : VISIBILITY := default
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : VISIBILITY := default
-endif
ifeq ($(gb_ENABLE_PCH),$(true))
ifneq ($(strip $$(PCH_NAME)),)
$(call gb_PrecompiledHeader_get_target,$$(PCH_NAME)) : VISIBILITY := default
@@ -1433,9 +1387,6 @@ endef
# call gb_LinkTarget_set_warnings_not_errors,linktarget
define gb_LinkTarget_set_warnings_not_errors
$(call gb_LinkTarget_get_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : WARNINGS_NOT_ERRORS := $(true)
-endif
endef
commit d92ac4ac04864456298130f4719f2b959c73eeb0
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 12:53:05 2013 +0100
gbuild: LinkTarget: why are loads of variables set on headers_target
It is not obvious to me why that was ever needed.
Change-Id: I3df679b41f0685ab288294fa3fadfede093f6f69
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 66ba973..829cbfa 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -566,39 +566,28 @@ $(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCOBJECTS :=
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS := $$(gb_LinkTarget_CFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CFLAGS_APPEND :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(gb_LinkTarget_CXXFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS := $$(gb_LinkTarget_OBJCXXFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCXXFLAGS_APPEND :=
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS := $$(gb_LinkTarget_OBJCFLAGS)
$(call gb_LinkTarget_get_target,$(1)) : T_OBJCFLAGS_APPEND :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $$(call gb_LinkTarget_rtl_defs,$(1)) $(CPPFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(gb_LinkTarget_DEFAULTDEFS) $(CPPFLAGS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $$(gb_LinkTarget_INCLUDE)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := $$(gb_LinkTarget_LDFLAGS) $(call gb_LinkTarget_get_linksearchpath_for_layer,$(3)) $(call gb_LinkTarget__get_ldflags,$(2))
$(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : T_LIBS :=
$(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
$(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX :=
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJNOEX :=
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PDBFILE :=
$(call gb_LinkTarget_get_target,$(1)) : EXTRAOBJECTLISTS :=
$(call gb_LinkTarget_get_target,$(1)) : NATIVERES :=
@@ -649,9 +638,7 @@ endef
# call gb_LinkTarget_add_defs,linktarget,defines
define gb_LinkTarget_add_defs
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : DEFS += $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS += $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : DEFS += $(2)
@@ -684,9 +671,7 @@ endef
# call gb_LinkTarget_add_cxxflags,linktarget,cxxflags
define gb_LinkTarget_add_cxxflags
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS += $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : T_CXXFLAGS_APPEND += $(2)
@@ -731,7 +716,6 @@ endef
# call gb_LinkTarget__add_include,linktarget,includes
define gb_LinkTarget__add_include
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE += -I$(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE += -I$(2)
@@ -750,7 +734,6 @@ endef
define gb_LinkTarget_set_include
$(call gb_LinkTarget__check_srcdir_paths,$(1),\
$(patsubst -I%,%,$(filter -I$(SRCDIR)/%,$(filter-out -I$(WORKDIR)/%,$(2)))))
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : INCLUDE := $(2)
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_LinkTarget_get_dep_target,$(1)) : INCLUDE := $(2)
@@ -1355,9 +1338,7 @@ $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME := $(3)
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJEX = $(call gb_PrecompiledHeader_get_objectfile, $(call gb_PrecompiledHeader_get_target,$(3)))
$(call gb_LinkTarget_get_target,$(1)) : PCHOBJS = $$(PCHOBJEX)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_DEFS := $$(DEFS)
-$(call gb_LinkTarget_get_headers_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : PCH_CXXFLAGS := $$(T_CXXFLAGS) $(call gb_LinkTarget__get_cxxflags,$(4))
$(call gb_PrecompiledHeader_get_target,$(3)) : VISIBILITY :=
commit 73f1b1967263d76ea1825b157059cd30ad73cb08
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 12:43:28 2013 +0100
gbuild: gb_LinkTarget__get_headers_check can signal error now
... since no external link targets not with gbuild should be used via
gb_LinkTarget_use_library/static_library.
Change-Id: I1c3188dbbe2eaa2f5acfb8944a79ad3b67a95998
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index f646a8f..66ba973 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -485,14 +485,9 @@ endif
# target. When the rule for the headertarget is executed and SELF does not
# match the target name, we are depending on a linktarget that was never
# declared. In a full build exclusively in gbuild that should never happen.
-# However, partial gbuild build will not know about how to build lower level
-# linktargets, just as gbuild can not know about linktargets generated in the
-# old build.pl/dmake system. Once all is migrated, gbuild should error out
-# when is is told to depend on a linktarget it does not know about and not
-# only warn.
define gb_LinkTarget__get_headers_check
ifneq ($$(SELF),$$*)
-$$(eval $$(call gb_Output_info,LinkTarget $$* not defined: Assuming headers to be there!,ALL))
+$$(eval $$(call gb_Output_error,used LinkTarget $$* not defined))
endif
$$@ : COMMAND := $$(call gb_Helper_abbreviate_dirs, touch $$@)
commit 077c428cae6c09e464c0d1a547f169528b742a61
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 12:40:28 2013 +0100
gbuild: LinkTarget: setting FLAGS on clean target not necessary
Change-Id: Icc07e06e0ea7a7e5094d758a9aba0415449f706f
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 9669a56..f646a8f 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -557,11 +557,9 @@ $(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : CXXOBJECTS :=
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : YACCOBJECT :=
-$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_YACCFLAGS := $$(gb_LinkTarget_YYACFLAGS) $(YACCFLAGS)
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : LEXOBJECT :=
-$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : T_LEXFLAGS := $$(gb_LinkTarget_LEXFLAGS) $(LEXFLAGS)
$(call gb_LinkTarget_get_clean_target,$(1)) \
$(call gb_LinkTarget_get_target,$(1)) : OBJCOBJECTS :=
commit bc5069ac40a19fc0f421403c9f8ae7e645b34cbb
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 12:19:09 2013 +0100
remove SOLARENV variable
It is constant and can just be replaced by $(SRCDIR)/solenv.
Use BUILD_TYPE where it was used to check if config_*.mk is sourced.
Change-Id: Ib9d480c57194b6340093aa47776f8768df69b7d1
diff --git a/Makefile.gbuild b/Makefile.gbuild
index 65ff9f2..8c41a28 100644
--- a/Makefile.gbuild
+++ b/Makefile.gbuild
@@ -16,7 +16,7 @@ endif
include $(BUILDDIR)/config_$(gb_Side).mk
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(SRCDIR)/solenv/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule_$(gb_Side).mk))
diff --git a/Makefile.in b/Makefile.in
index bc8ed76..0c38404 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -180,7 +180,7 @@ distclean : clean compilerplugins-clean
$(BUILDDIR)/ios/lo.xcconfig \
$(BUILDDIR)/lo.xcent \
$(BUILDDIR)/sysui/desktop/macosx/Info.plist
- find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
+ find $(SRCDIR)/solenv/gdb -name "*.pyc" -exec rm {} \;
#
# custom command
@@ -331,7 +331,7 @@ tags:
@create-tags
docs:
- @mkdocs.sh $(SRCDIR)/docs $(SOLARENV)/inc/doxygen.cfg
+ @mkdocs.sh $(SRCDIR)/docs $(SRCDIR)/solenv/inc/doxygen.cfg
findunusedcode:
@which callcatcher > /dev/null 2>&1 || \
@@ -345,7 +345,7 @@ findunusedcode:
@echo unexport ARCH_FLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
@echo unexport CXXFLAGS >> $(SRCDIR)/callcatcher/config_host.mk
- $(GNUMAKE) -f $(SOLARENV)/bin/callcatcher.Makefile findunusedcode
+ $(GNUMAKE) -f $(SRCDIR)/solenv/bin/callcatcher.Makefile findunusedcode
@grep ::.*\( unusedcode.all \
| grep -v ^Atom \
| grep -v ^atom:: \
diff --git a/compilerplugins/Makefile b/compilerplugins/Makefile
index 4281c12..b458116 100644
--- a/compilerplugins/Makefile
+++ b/compilerplugins/Makefile
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-ifeq ($(SOLARENV),)
+ifeq ($(BUILD_TYPE),)
ifeq ($(gb_Side),)
gb_Side:=host
endif
diff --git a/config_host.mk.in b/config_host.mk.in
index ddb234a..57e0574 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -469,7 +469,6 @@ export SCPDEFS=@SCPDEFS@
export SDKDIRNAME=@SDKDIRNAME@
export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@
export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
-export SOLARENV=@SRC_ROOT@/solenv
export SOLARINC=@SOLARINC@
export SOLARLIB=@SOLARLIB@
export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
diff --git a/configure.ac b/configure.ac
index 6c1dd73..7f992a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,11 @@ dnl in order to create a configure script.
AC_INIT([LibreOffice],[4.2.0.0.alpha0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
+
+if test -n "$BUILD_TYPE"; then
+ AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.])
+fi
+
save_CC=$CC
save_CXX=$CXX
@@ -73,10 +78,6 @@ add_warning()
echo "$COLORWARN $@" >> warn
}
-if test -n "$SOLARENV"; then
- AC_MSG_ERROR([You have sourced config_host.mk in this shell. This may lead to trouble, please run in a fresh (login) shell.])
-fi
-
echo "********************************************************************"
echo "*"
echo "* Running ${PACKAGE_NAME} build configuration."
diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk
index 8bc87e5..b87b4d3 100644
--- a/external/firebird/ExternalProject_firebird.mk
+++ b/external/firebird/ExternalProject_firebird.mk
@@ -51,7 +51,7 @@ $(call gb_ExternalProject_get_state_target,firebird,build):
$(gb_Helper_set_ld_path)) \
$(MAKE) firebird_embedded \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \
)
# vim: set noet sw=4 ts=4:
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk
index f348718..2d65015 100644
--- a/external/icu/ExternalProject_icu.mk
+++ b/external/icu/ExternalProject_icu.mk
@@ -87,7 +87,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) :
--with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \
$(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION)) \
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 9082cc5..2af27ac 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -27,7 +27,7 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/install,\
))
$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: \
- $(SOLARENV)/bin/make_installer.pl \
+ $(SRCDIR)/solenv/bin/make_installer.pl \
$(foreach ulf,$(instsetoo_ULFLIST),$(call gb_CustomTarget_get_workdir,instsetoo_native/install)/win_ulffiles/$(ulf).ulf) \
$(if $(filter-out WNT,$(OS)),\
$(addprefix $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/,\
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index 13a1047..475a7d8 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -68,7 +68,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
$(MAKE) -j1 AR=$(AR) RANLIB=$(RANLIB) NMEDIT=$(NM)edit nss_build_all \
&& rm -f $(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/lib/*.a \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libfreebl3.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnspr4.dylib \
$(gb_Package_SOURCEDIR_nss)/mozilla/dist/out/lib/libnss3.dylib \
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index d44a41e..37b81df 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -36,7 +36,7 @@ $(packimages_DIR)/%.zip : \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
$(call gb_Helper_abbreviate_dirs, \
- $(PERL) $(SOLARENV)/bin/packimages.pl \
+ $(PERL) $(SRCDIR)/solenv/bin/packimages.pl \
-g $(SRCDIR)/icon-themes/galaxy \
-m $(SRCDIR)/icon-themes/galaxy \
$(if $(DEFAULT_THEME),\
@@ -62,7 +62,7 @@ $(packimages_DIR)/commandimagelist.ilst :
find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
sed "s#$(SRCDIR)/icon-themes/galaxy#%MODULE%#" | \
LC_ALL=C sort > $@.$(INPATH) && \
- $(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \
+ $(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.$(INPATH) $@ \
$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
$(packimages_DIR)/sorted.lst : \
@@ -70,6 +70,7 @@ $(packimages_DIR)/sorted.lst : \
$(call gb_Postprocess_get_target,AllUIConfigs)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
$(call gb_Helper_abbreviate_dirs, \
- $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
+ $(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \
+ $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@)
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index b78ff02..7f240b6 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -569,7 +569,7 @@ $(call gb_XcdTarget_get_target,main.xcd) : \
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
- $(SOLARENV)/bin/packregistry.xslt $< \
+ $(SRCDIR)/solenv/bin/packregistry.xslt $< \
| sed $(postprocess_main_SED) > $@ \
)
@@ -579,7 +579,7 @@ $(call gb_XcdTarget_get_target,%.xcd) : \
$(call gb_Helper_abbreviate_dirs, \
mkdir -p $(dir $@) && \
$(call gb_ExternalExecutable_get_command,xsltproc) --nonet \
- -o $@ $(SOLARENV)/bin/packregistry.xslt $< \
+ -o $@ $(SRCDIR)/solenv/bin/packregistry.xslt $< \
)
$(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list :
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index 00c6ad4..6b695de 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -60,7 +60,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build):
$(if $(filter NO,$(SYSTEM_LIBXML)),--with-xml2-config=$(call gb_UnpackedTarball_get_dir,xml2)/xml2-config) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \
)
endif
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 2e3e9dd..9b96c9c 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -65,7 +65,7 @@ $(call gb_ExternalProject_get_state_target,redland,build):
$(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \
&& $(MAKE) \
$(if $(filter MACOSX,$(OS)),&& $(PERL) \
- $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \
+ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \
$(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \
)
endif
diff --git a/solenv/bin/callcatcher.Makefile b/solenv/bin/callcatcher.Makefile
index fc11e54..58bfe6f 100644
--- a/solenv/bin/callcatcher.Makefile
+++ b/solenv/bin/callcatcher.Makefile
@@ -20,7 +20,7 @@ export AR:=callarchive $(AR)
endif
export dbglevel:=2
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(SRCDIR)/solenv/gbuild/gbuild.mk
findunusedcode:
$(GNUMAKE) BUILDDIR=callcatcher -j $(PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.gbuild
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index 7368856..3787bec 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -7,7 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
-GDBDIR="${SOLARENV}/gdb"
+GDBDIR="${SRCDIR}/solenv/gdb"
INSTALLDIR="${TESTINSTALLDIR}"
DYLIB=so
if [ "$(uname)" = Darwin ]; then
diff --git a/solenv/bin/make_installer.pl b/solenv/bin/make_installer.pl
index 81e52f9..48aaada 100644
--- a/solenv/bin/make_installer.pl
+++ b/solenv/bin/make_installer.pl
@@ -19,7 +19,7 @@
use strict;
use warnings;
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
use installer qw(main);
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 9d1c200..ef7f2f6 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -159,7 +159,7 @@ sub getparameter
}
# Usage of simple installer (not for Windows):
- # $PERL -w $SOLARENV/bin/make_installer.pl \
+ # $PERL -w $SRCDIR/solenv/bin/make_installer.pl \
# -f openoffice.lst -l en-US -p OpenOffice \
# -buildid $BUILD -rpm \
# -destdir /tmp/nurk -simple $INSTALL_PATH
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 138195c..c14b771 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -97,7 +97,7 @@ print "Running LibreOffice installer\n";
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
"perl " .
(scalar keys(%DB::sub) ? "-d " : "") .
- "-w $ENV{SOLARENV}/bin/make_installer.pl " .
+ "-w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l $langs -p LibreOffice " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
@@ -106,7 +106,7 @@ system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
if ($ENV{BUILD_TYPE} =~ m/ODK/) {
print "Running SDK installer\n";
system ("cd $ENV{SRC_ROOT}/instsetoo_native/util ; " .
- "perl -w $ENV{SOLARENV}/bin/make_installer.pl " .
+ "perl -w $ENV{SRCDIR}/solenv/bin/make_installer.pl " .
"-f $ENV{BUILDDIR}/instsetoo_native/util/openoffice.lst -l en-US -p LibreOffice_SDK " .
"-u $tmp_dir " .
"-buildid $BUILD $destdir $strip $msi " .
diff --git a/solenv/bin/par2script.pl b/solenv/bin/par2script.pl
index aac638d..000da99 100644
--- a/solenv/bin/par2script.pl
+++ b/solenv/bin/par2script.pl
@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
use Cwd;
use par2script::check;
diff --git a/solenv/bin/pre2par.pl b/solenv/bin/pre2par.pl
index 8c7a32e..42c319d 100644
--- a/solenv/bin/pre2par.pl
+++ b/solenv/bin/pre2par.pl
@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-use lib ("$ENV{SOLARENV}/bin/modules");
+use lib ("$ENV{SRCDIR}/solenv/bin/modules");
use Cwd;
use pre2par::directory;
diff --git a/solenv/gbuild/CliAssembly.mk b/solenv/gbuild/CliAssembly.mk
index 7c6e3b7..5683ae7 100644
--- a/solenv/gbuild/CliAssembly.mk
+++ b/solenv/gbuild/CliAssembly.mk
@@ -9,7 +9,7 @@
# CliConfigTarget class
-gb_CliConfigTarget_TARGET := $(SOLARENV)/bin/clipatchconfig.pl
+gb_CliConfigTarget_TARGET := $(SRCDIR)/solenv/bin/clipatchconfig.pl
gb_CliConfigTarget_COMMAND := $(PERL) -w $(gb_CliConfigTarget_TARGET)
gb_CliConfigTarget_VERSIONFILE_DEFAULT := $(SRCDIR)/cli_ure/version/version.txt
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 0957f9f..56fa9e6 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -17,7 +17,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
-gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
+gb_ComponentTarget_XSLTCOMMANDFILE := $(SRCDIR)/solenv/bin/createcomponent.xslt
gb_ComponentTarget_get_source = $(SRCDIR)/$(1).component
# In the DISABLE_DYNLOADING case we don't need any COMPONENTPREFIX, we
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 21b828f..f05bae7 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -27,7 +27,7 @@ printf '\nError: a unit test failed, please do one of:\n\nexport DEBUGCPPUNIT=TR
endef
ifeq ($(strip $(DEBUGCPPUNIT)),TRUE)
-gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --command=$(SOLARENV)/bin/gdbtrycatchtrace-stdout -return-child-result --args
+gb_CppunitTest_GDBTRACE := gdb -nx -ex "add-auto-load-safe-path $(INSTDIR)" --command=$(SRCDIR)/solenv/bin/gdbtrycatchtrace-stdout -return-child-result --args
else ifneq ($(strip $(CPPUNITTRACE)),)
gb_CppunitTest_GDBTRACE := $(CPPUNITTRACE)
gb_CppunitTest__interactive := $(true)
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index b61bb02..63090fa 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -11,7 +11,7 @@
# Handles creation of image galleries.
-gb_Gallery_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl
+gb_Gallery_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl
gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery
# BRAND_BASE_DIR is for resource files
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 9cfc0c4..54848b0 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -129,7 +129,7 @@ endef
# ScpTarget class
-gb_ScpTarget_TARGET := $(SOLARENV)/bin/pre2par.pl
+gb_ScpTarget_TARGET := $(SRCDIR)/solenv/bin/pre2par.pl
gb_ScpTarget_COMMAND := $(PERL) $(gb_ScpTarget_TARGET)
define gb_ScpTarget__command
diff --git a/solenv/gbuild/InstallScript.mk b/solenv/gbuild/InstallScript.mk
index 41e94f5..593bd3e 100644
--- a/solenv/gbuild/InstallScript.mk
+++ b/solenv/gbuild/InstallScript.mk
@@ -9,7 +9,7 @@
# InstallScript class
-gb_InstallScript_TARGET := $(SOLARENV)/bin/par2script.pl
+gb_InstallScript_TARGET := $(SRCDIR)/solenv/bin/par2script.pl
gb_InstallScript_COMMAND := $(PERL) $(gb_InstallScript_TARGET)
gb_InstallScript__make_arglist = $(subst $(WHITESPACE),$(COMMA),$(strip $(1)))
diff --git a/solenv/gbuild/Rdb.mk b/solenv/gbuild/Rdb.mk
index 9ec2d0f..d65aec6 100644
--- a/solenv/gbuild/Rdb.mk
+++ b/solenv/gbuild/Rdb.mk
@@ -17,7 +17,8 @@ $(call gb_Helper_abbreviate_dirs,\
$(foreach component,$(COMPONENTS),echo "<filename>$(call gb_ComponentTarget_get_target,$(component))</filename>" &&) \
echo '</list>' \
) > $(1).input && \
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) $(SOLARENV)/bin/packcomponents.xslt $(1).input && \
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $(1) \
+ $(SRCDIR)/solenv/bin/packcomponents.xslt $(1).input && \
rm $(1).input)
endef
diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk b/solenv/gbuild/extensions/pre_SharedLangList.mk
index e42c697..16ab3fc 100644
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ b/solenv/gbuild/extensions/pre_SharedLangList.mk
@@ -17,7 +17,7 @@
#
# share language list with dmake build system
-include $(SOLARENV)/inc/langlist.mk
+include $(SRCDIR)/solenv/inc/langlist.mk
ifneq ($(WITH_LANG),ALL)
gb_WITH_LANG=$(WITH_LANG)
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index 87e37cc..68e807b 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -25,12 +25,12 @@ ifeq (,$(BUILDDIR))
BUILDDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))../..
endif
-ifeq ($(SOLARENV),)
+ifeq ($(BUILD_TYPE),)
include $(BUILDDIR)/config_$(gb_Side).mk
endif
gb_PARTIAL_BUILD := T
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(SRCDIR)/solenv/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(wildcard $(module_directory)/Module*.mk)))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index a57530b..c46cba1 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -151,9 +151,9 @@ $(call gb_Helper_abbreviate_dirs,\
-o $(1) && \
$(if $(SOVERSIONSCRIPT),ln -sf $(1) $(ILIBTARGET),:) && \
$(if $(filter Executable,$(TARGETTYPE)), \
- $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \
+ $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl app $(LAYER) $(1) &&) \
$(if $(filter Library Bundle CppunitTest,$(TARGETTYPE)),\
- $(PERL) $(SOLARENV)/bin/macosx-change-install-names.pl shl $(LAYER) $(1) &&) \
+ $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl $(LAYER) $(1) &&) \
$(if $(MACOSX_CODESIGNING_IDENTITY), \
$(if $(filter Executable,$(TARGETTYPE)), \
(codesign --identifier=$(MACOSX_BUNDLE_IDENTIFIER).$(notdir $(1)) --sign $(MACOSX_CODESIGNING_IDENTITY) --force $(1) || true) &&)) \
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 6f7147f..79eea3a 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -27,7 +27,7 @@ endif
share_WORKDIR := $(call gb_CustomTarget_get_workdir,sysui/share)
share_SRCDIR := $(SRCDIR)/sysui/desktop
-share_TRANSLATE := $(SOLARENV)/bin/desktop-translate.pl
+share_TRANSLATE := $(SRCDIR)/solenv/bin/desktop-translate.pl
LAUNCHERLIST_APPS := writer calc draw impress math base startcenter
LAUNCHERLIST := $(LAUNCHERLIST_APPS) qstart xsltfilter
commit 64a882888665dcbe15acc5793e7c9cf5f1bdc575
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Nov 1 11:38:12 2013 +0100
gbuild: SOLARBINDIR does not exist any more
Change-Id: Ia158e398acbd5a48dca33d59dd47705376a4dc26
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 5bd285c..718cb91 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -78,7 +78,7 @@ endef
# gb_SrsPartTarget__command_dep
gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
-gb_ResTarget_RSCCOMMAND = SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,rsc)
+gb_ResTarget_RSCCOMMAND = $(call gb_Executable_get_command,rsc)
define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 5ec75a5..61fd02c 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -20,10 +20,10 @@
# UnoApiTarget
gb_UnoApiTarget_UNOIDLWRITEDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-write)
-gb_UnoApiTarget_UNOIDLWRITECOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,unoidl-write)
+gb_UnoApiTarget_UNOIDLWRITECOMMAND := $(call gb_Executable_get_command,unoidl-write)
gb_UnoApiTarget_UNOIDLCHECKDEPS := $(call gb_Executable_get_runtime_dependencies,unoidl-check)
-gb_UnoApiTarget_UNOIDLCHECKCOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,unoidl-check)
+gb_UnoApiTarget_UNOIDLCHECKCOMMAND := $(call gb_Executable_get_command,unoidl-check)
define gb_UnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),UNO,4)
@@ -126,7 +126,7 @@ $(eval $(call gb_Output_error,gb_UnoApiHeadersTarget_select_variant must be defi
endif
gb_UnoApiHeadersTarget_CPPUMAKERDEPS := $(call gb_Executable_get_runtime_dependencies,cppumaker)
-gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := SOLARBINDIR=$(gb_Executable_BINDIR_FOR_BUILD) $(call gb_Executable_get_command,cppumaker)
+gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND := $(call gb_Executable_get_command,cppumaker)
define gb_UnoApiHeadersTarget__command
$(gb_UnoApiHeadersTarget_CPPUMAKERCOMMAND) \
More information about the Libreoffice-commits
mailing list