[Libreoffice-commits] .: 13 commits - GNUmakefile.mk rsc/Executable_rsc.mk solenv/gbuild
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Oct 21 12:29:05 PDT 2011
GNUmakefile.mk | 2
rsc/Executable_rsc.mk | 4
solenv/gbuild/AllLangResTarget.mk | 31 +-----
solenv/gbuild/BuildDirs.mk | 19 ---
solenv/gbuild/ComponentTarget.mk | 23 +---
solenv/gbuild/ExternalLib.mk | 6 -
solenv/gbuild/LinkTarget.mk | 136 +++++++++-------------------
solenv/gbuild/TargetLocations.mk | 7 -
solenv/gbuild/UnoApiTarget.mk | 12 --
solenv/gbuild/WinResTarget.mk | 6 -
solenv/gbuild/extensions/post_SetupLocal.mk | 68 --------------
solenv/gbuild/gbuild.mk | 8 +
solenv/gbuild/platform/ios.mk | 4
solenv/gbuild/platform/macosx.mk | 6 -
solenv/gbuild/platform/unxgcc.mk | 4
solenv/gbuild/platform/windows.mk | 4
solenv/gbuild/platform/winmingw.mk | 4
17 files changed, 100 insertions(+), 244 deletions(-)
New commits:
commit 7bf06ba95d6ba0e673f2aff5b4412dbf08702590
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 21:08:47 2011 +0200
rename YaccObject to YaccTarget
the object is a GenCxxObject just like those from CustomTargets, we only need to get the generation right
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 058dfd7..e1ed345 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-I$(SRCDIR)/rsc/inc/pch \
- -I$(WORKDIR)/YaccObject/rsc/source/parser \
+ -I$(WORKDIR)/YaccTarget/rsc/source/parser \
))
$(eval $(call gb_Executable_add_api,rsc,\
@@ -58,7 +58,7 @@ $(eval $(call gb_Executable_add_grammars,rsc,\
rsc/source/parser/rscyacc \
))
-$(call gb_YaccObject_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
+$(call gb_YaccTarget_get_target,rsc/source/parser/rscyacc): T_CXXFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS) $(gb_LinkTarget_CXXFLAGS) $(CXXFLAGS)
$(eval $(call gb_Executable_add_exception_objects,rsc,\
rsc/source/parser/erscerr \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bbaa479..271ce81 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -224,25 +224,25 @@ endif
gb_GenCxxObject_GenCxxObject =
-# YaccObject class
-gb_YaccObject_get_source = $(1)/$(2).y
+# YaccTarget class
+gb_YaccTarget_get_source = $(1)/$(2).y
-.PHONY : $(call gb_YaccObject_get_clean_target,%)
-$(call gb_YaccObject_get_clean_target,%) :
+.PHONY : $(call gb_YaccTarget_get_clean_target,%)
+$(call gb_YaccTarget_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject_get_target,$*))
+ rm -f $(call gb_YaccTarget_get_header_target,$*) $(call gb_YaccTarget_get_target,$*))
-$(call gb_YaccObject_get_target,%) : $(call gb_YaccObject_get_source,$(SRCDIR),%)
- $(call gb_YaccObject__command,$<,$*,$@,$(call gb_YaccObject_get_header_target,$*))
+$(call gb_YaccTarget_get_target,%) : $(call gb_YaccTarget_get_source,$(SRCDIR),%)
+ $(call gb_YaccTarget__command,$<,$*,$@,$(call gb_YaccTarget_get_header_target,$*))
-gb_YaccObject_YaccObject =
+gb_YaccTarget_YaccTarget =
gb_YACC := bison
-# YaccObject class
+# YaccTarget class
# defined by platform
-# gb_YaccObject__command(grammar-file, stem-for-message, source-target, include-target)
+# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target)
# ObjCxxObject class
#
@@ -852,13 +852,13 @@ endef
# Add a bison grammar to the build.
# gb_LinkTarget_add_grammar(<component>,<grammar file>)
define gb_LinkTarget_add_grammar
-$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccObject/$(2))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccObject_get_clean_target,$(2))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccObject_get_header_target,$(2)))
+$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccTarget/$(2))
+$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccTarget_get_clean_target,$(2))
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccTarget_get_header_target,$(2)))
endef
-#$(call gb_YaccObject_YaccObject,$(2))
+#$(call gb_YaccTarget_YaccTarget,$(2))
# Add bison grammars to the build.
# gb_LinkTarget_add_grammars(<component>,<grammar file> [<grammar file>*])
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index e602a37..9205d44 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -125,8 +125,8 @@ gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
# workdir targets: $(1) is prefix/path
gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
-gb_YaccObject_get_header_target = $(WORKDIR)/YaccObject/$(1).hxx
-gb_YaccObject_get_target = $(WORKDIR)/YaccObject/$(1).cxx
+gb_YaccTarget_get_header_target = $(WORKDIR)/YaccTarget/$(1).hxx
+gb_YaccTarget_get_target = $(WORKDIR)/YaccTarget/$(1).cxx
gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
@@ -176,7 +176,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
ExternalLib \
UnoApiTarget \
WinResTarget \
- YaccObject \
+ YaccTarget \
Zip \
XcsTarget \
XcuDataTarget \
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 664af6e..a131a8a 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -137,9 +137,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-# YaccObject class
+# YaccTarget class
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4113d5e..37adf1b 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -167,7 +167,7 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-# YaccObject class
+# YaccTarget class
ifeq ($(CPUNAME),POWERPC)
#
@@ -176,7 +176,7 @@ ifeq ($(CPUNAME),POWERPC)
# the result is that the header is named <foo>.cxx.h instead of <foo>.hxx
# so we queue a mv to rename the header accordingly.
#
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
@@ -185,7 +185,7 @@ $(call gb_Helper_abbreviate_dirs,\
endef
else
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 23077cb..01421da 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -224,9 +224,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib
-# YaccObject class
+# YaccTarget class
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 0b88aa4..219232a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -271,9 +271,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-# YaccObject class
+# YaccTarget class
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 6d438ff..6255974 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -170,9 +170,9 @@ endef
gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
-# YaccObject class
+# YaccTarget class
-define gb_YaccObject__command
+define gb_YaccTarget__command
$(call gb_Output_announce,$(2),$(true),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $(3)) && \
commit 5dc33abf609707a2a12e2cb84af8c5ea20fffd42
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 20:55:51 2011 +0200
cleanup YaccObject
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index c95678d..058dfd7 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -34,7 +34,7 @@ $(eval $(call gb_Executable_set_include,rsc,\
$$(INCLUDE) \
-I$(SRCDIR)/rsc/inc \
-I$(SRCDIR)/rsc/inc/pch \
- -I$(WORKDIR)/rsc/source/parser \
+ -I$(WORKDIR)/YaccObject/rsc/source/parser \
))
$(eval $(call gb_Executable_add_api,rsc,\
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index fb12c06..bbaa479 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -130,6 +130,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_CObject_get_dep_target,%) : $(call gb_CObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_CObject_get_target,$*)))
+
endif
gb_CObject_CObject =
@@ -178,6 +179,7 @@ $(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(eval $(gb_CxxObject__set_pchflags))\
$(call gb_Object__command_dep,$@,$(call gb_CxxObject_get_target,$*)))
+
endif
gb_CxxObject_CxxObject =
@@ -197,6 +199,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_GenCObject_get_dep_target,%) : $(call gb_GenCObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_GenCObject_get_target,$*)))
+
endif
gb_GenCObject_GenCObject =
@@ -216,6 +219,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_GenCxxObject_get_target,$*)))
+
endif
gb_GenCxxObject_GenCxxObject =
@@ -227,16 +231,12 @@ gb_YaccObject_get_source = $(1)/$(2).y
$(call gb_YaccObject_get_clean_target,%) :
$(call gb_Output_announce,$(2),$(false),YAC,3)
$(call gb_Helper_abbreviate_dirs,\
- rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject__get_generated_source,$*))
+ rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject_get_target,$*))
-gb_YaccObject__get_generated_source = $(WORKDIR)/YaccObject/$(1).cxx
+$(call gb_YaccObject_get_target,%) : $(call gb_YaccObject_get_source,$(SRCDIR),%)
+ $(call gb_YaccObject__command,$<,$*,$@,$(call gb_YaccObject_get_header_target,$*))
-define gb_YaccObject_YaccObject
-$(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
-$(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
-$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SRCDIR),$(1))
- $$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
-endef
+gb_YaccObject_YaccObject =
gb_YACC := bison
@@ -257,6 +257,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_ObjCxxObject_get_dep_target,%) : $(call gb_ObjCxxObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_ObjCxxObject_get_target,$*)))
+
endif
gb_ObjCxxObject_ObjCxxObject =
@@ -286,6 +287,7 @@ $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
$(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
+
endif
gb_ObjCObject_ObjCObject =
@@ -305,6 +307,7 @@ ifeq ($(gb_FULLDEPS),$(true))
$(call gb_AsmObject_get_dep_target,%) : $(call gb_AsmObject_get_target,%)
$(if $(wildcard $@),touch $@,\
$(call gb_Object__command_dep,$@,$(call gb_AsmObject_get_target,$*)))
+
endif
gb_AsmObject_AsmObject =
@@ -846,27 +849,16 @@ endif
endef
-define gb_LinkTarget_yacc_add_cpp_dep
-$(call gb_CxxObject_get_target,$(2)) : $(call gb_YaccObject_get_target,$(1))
-endef
-
# Add a bison grammar to the build.
# gb_LinkTarget_add_grammar(<component>,<grammar file>)
define gb_LinkTarget_add_grammar
-$(call gb_YaccObject_YaccObject,$(2))
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_YaccObject_get_target,$(2))
+$(call gb_LinkTarget_add_generated_cxx_object,$(1),YaccObject/$(2))
$(call gb_LinkTarget_get_clean_target,$(1)) : $(call gb_YaccObject_get_clean_target,$(2))
-$(call gb_LinkTarget_get_target,$(1)) : GENCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_clean_target,$(1)) : GENCXXOBJECTS += $(2)
-
-ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,$(1)) : GENCXXOBJECTS += $(2)
-$(call gb_LinkTarget_get_dep_target,$(1)) : $(call gb_YaccObject_get_dep_target,$(2))
-endif
+$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_YaccObject_get_header_target,$(2)))
-$(call gb_LinkTarget__add_internal_headers,$(1),$(gb_YaccObject_get_header_target,$(2)))
endef
+#$(call gb_YaccObject_YaccObject,$(2))
# Add bison grammars to the build.
# gb_LinkTarget_add_grammars(<component>,<grammar file> [<grammar file>*])
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index cdd43cc..e602a37 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -125,9 +125,8 @@ gb_UnoApiTarget_get_header_target = $(WORKDIR)/UnoApiHeaders/$(1)
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
# workdir targets: $(1) is prefix/path
gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
-gb_YaccObject_get_header_target = $(WORKDIR)/$(1).hxx
-gb_YaccObject_get_dep_target = $(call gb_GenCxxObject_get_dep_target,$(1))
-gb_YaccObject_get_target = $(call gb_GenCxxObject_get_target,$(1))
+gb_YaccObject_get_header_target = $(WORKDIR)/YaccObject/$(1).hxx
+gb_YaccObject_get_target = $(WORKDIR)/YaccObject/$(1).cxx
gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
commit b4d67c0eb176391b6d6ff5fb3c62d79b0e50bfe0
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:59:22 2011 +0200
only enable gb_CHECKOBJECTOWNER for explicit check runs
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 96044f9..1cc7243 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -126,9 +126,13 @@ else
gb_FULLDEPS := $(true)
endif
+# Life in the fast lane: only check for duplicate objects when explicitly building check targets
+# triples speed of noop builds
ifeq ($(origin gb_CHECKOBJECTOWNER),undefined)
+ifneq ($(filter check unitcheck subsequentcheck,$(MAKECMDGOALS)),)
gb_CHECKOBJECTOWNER := $(true)
endif
+endif
# save user-supplied flags for latter use
ifneq ($(strip $(CFLAGS)),)
commit 762a33f6c80ca762c67d5f59950a98a0a7108b8d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:58:15 2011 +0200
Fix for YaccObject, also: YaccObject should not generate stuff directly in toplevel workdir
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index bcc701a..fb12c06 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -229,13 +229,13 @@ $(call gb_YaccObject_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_YaccObject_get_header_target,$*) $(call gb_YaccObject__get_generated_source,$*))
-gb_YaccObject__get_generated_source = $(WORKDIR)/$(1).cxx
+gb_YaccObject__get_generated_source = $(WORKDIR)/YaccObject/$(1).cxx
define gb_YaccObject_YaccObject
$(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
$(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SRCDIR),$(1))
- $(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
+ $$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
endef
gb_YACC := bison
commit 1bee4434affbf6d53379079b7b3b4c618b8a8aaa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:36:08 2011 +0200
SetupLocal is gone, also fix unbalanced endif
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index ad2fa51..9802a61 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,13 +35,7 @@ ifeq ($(strip $(WORKDIR)),)
$(error WORKDIR variable is empty, no environment set, aborting)
endif
-# Override for SetupLocal
-ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),)
-include $(gb_LOCALBUILDDIR)/SetupLocal.mk
-endif
-
SRCDIR := $(SOLARSRC)
-endif
# HACK
# unixify windoze paths
commit c1880048af06a72e1eca7641c1ddc25fbba53bcd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:34:58 2011 +0200
gbuild should use SRCDIR as per GNU make conventions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 3506a63..5e0f89a 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -66,7 +66,7 @@ $(call gb_Helper_abbreviate_dirs_native,\
endef
-$(call gb_SrsPartMergeTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@)
@@ -92,12 +92,12 @@ $(call gb_Helper_abbreviate_dirs_native,\
endef
-$(call gb_SrsPartTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET)
+$(call gb_SrsPartTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET)
$(call gb_SrsPartTarget__command_dep,$*,$<)
$(call gb_SrsPartTarget__command,$@,$*,$<)
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_SrsPartTarget_get_dep_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY)
+$(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(dir $@) && \
echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@)
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index b0233c8..47b9f0f 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -50,10 +50,10 @@ $(call gb_ComponentTarget_get_clean_target,%) :
# creates 2 componentfiles: the first is for the installation set,
# the second is for using the component during the build.
# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
-$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
-$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SRCDIR),%) | $(gb_XSLTPROCTARGET)
$(call gb_ComponentTarget__command,$@,$<,$*)
$(call gb_ComponentTarget_get_target,%) :
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index c0cff41..4fe0793 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -100,9 +100,9 @@ define gb_ExternalLib__command_autotools
rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \
mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
$(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
- cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$$p || exit 1; done && \
+ cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SRCDIR)/$$p || exit 1; done && \
CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
- for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$p || exit 1; done
+ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SRCDIR)/$p || exit 1; done
#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i -e 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i -e 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi
+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1))
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 5a4737a..bcc701a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -123,7 +123,7 @@ gb_CObject_get_source = $(1)/$(2).c
# defined by platform
# gb_CObject__command
-$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SOLARSRC),%)
+$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SRCDIR),%)
$(call gb_CObject__command,$@,$*,$<,$(call gb_CObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
@@ -169,7 +169,7 @@ endif
endif
endef
-$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SOLARSRC),%)
+$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SRCDIR),%)
$(eval $(gb_CxxObject__set_pchflags))
$(call gb_CxxObject__command,$@,$*,$<,$(call gb_CxxObject_get_dep_target,$*))
@@ -234,8 +234,8 @@ gb_YaccObject__get_generated_source = $(WORKDIR)/$(1).cxx
define gb_YaccObject_YaccObject
$(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
$(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
-$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SOLARSRC),$(1))
- $(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SOLARSRC),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
+$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SRCDIR),$(1))
+ $(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SRCDIR),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
endef
gb_YACC := bison
@@ -280,11 +280,11 @@ else
gb_ObjCObject__command_dep =
endif
-$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
$(call gb_ObjCObject__command,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%)
$(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
endif
@@ -298,7 +298,7 @@ gb_ObjCObject_ObjCObject =
# gb_AsmObject_get_source (.asm on Windows, .s elsewhere)
# gb_AsmObject__command
-$(call gb_AsmObject_get_target,%) : $(call gb_AsmObject_get_source,$(SOLARSRC),%)
+$(call gb_AsmObject_get_target,%) : $(call gb_AsmObject_get_source,$(SRCDIR),%)
$(call gb_AsmObject__command,$@,$*,$<,$(call gb_AsmObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 03dd8ef..816fb85 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -66,7 +66,7 @@ endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -86,7 +86,7 @@ endef
define gb_UnoApiTarget_add_idlfiles_noheader
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -101,7 +101,7 @@ endef
define gb_UnoApiTarget_add_idlfiles_nohdl
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),$(SRCDIR)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -141,7 +141,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
endef
define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SOLARSRC)/$(strip $(2)).rdb
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SRCDIR)/$(strip $(2)).rdb
endef
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 931b8bd..234ab2d 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -60,13 +60,13 @@ endef
define gb_WinResTarget_add_file
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
-$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SOLARSRC)/$(strip $(2)).rc)
-$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SOLARSRC)/$(strip $(2)).rc)
+$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SRCDIR)/$(strip $(2)).rc)
+$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SRCDIR)/$(strip $(2)).rc)
endef
define gb_WinResTarget_add_dependency
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SOLARSRC)/$(strip $(file))))
+$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SRCDIR)/$(strip $(file))))
endef
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index fb3ab09..96044f9 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -152,7 +152,7 @@ include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
$(eval $(call gb_Helper_init_registries))
-$(eval $(call gb_Helper_add_repositories,$(SOLARSRC)))
+$(eval $(call gb_Helper_add_repositories,$(SRCDIR)))
$(eval $(call gb_Helper_collect_libtargets))
gb_Library_DLLPOSTFIX := lo
@@ -194,7 +194,7 @@ endif
include $(GBUILDDIR)/Tempfile.mk
-include $(SOLARSRC)/RepositoryFixes.mk
+include $(SRCDIR)/RepositoryFixes.mk
$(eval $(call gb_Helper_collect_knownlibs))
commit a260c792f437f62c96289ac314faa0c6c4e128ae
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:25:07 2011 +0200
kill multi repo support: BuildDirs and gbuild.mk, GNUmakefile.mk
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index e25b46e..1810a2e 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -33,6 +33,6 @@ endif
GBUILDDIR := $(SOLARENV)/gbuild
include $(GBUILDDIR)/gbuild.mk
-$(foreach repo,$(gb_REPOS),$(eval $(call gb_Module_make_global_targets,$(wildcard $(repo)/RepositoryModule_*.mk))))
+$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 6cb575a..ad2fa51 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -40,8 +40,7 @@ ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),
include $(gb_LOCALBUILDDIR)/SetupLocal.mk
endif
-ifeq ($(strip $(gb_REPOS)),)
-gb_REPOS := $(SOLARSRC)
+SRCDIR := $(SOLARSRC)
endif
# HACK
@@ -50,15 +49,9 @@ ifeq ($(OS_FOR_BUILD),WNT)
override WORKDIR := $(shell cygpath -u $(WORKDIR))
override OUTDIR := $(shell cygpath -u $(OUTDIR))
override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
-override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
+override SRCDIR := $(shell cygpath -u $(SRCDIR))
endif
-REPODIR := $(patsubst %/,%,$(dir $(firstword $(gb_REPOS))))
-
-ifeq ($(filter setuplocal removelocal,$(MAKECMDGOALS)),)
-ifneq ($(filter-out $(foreach repo,$(gb_REPOS),$(realpath $(repo))/%),$(realpath $(firstword $(MAKEFILE_LIST)))),)
-$(eval $(call gb_Output_error,The initial makefile $(realpath $(firstword $(MAKEFILE_LIST))) is not in the repositories $(foreach repo,$(gb_REPOS),$(realpath $(repo))).,ALL))
-endif
-endif
+REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
# vim: set noet sw=4:
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 22b9216..fb3ab09 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -152,7 +152,7 @@ include $(GBUILDDIR)/Helper.mk
include $(GBUILDDIR)/TargetLocations.mk
$(eval $(call gb_Helper_init_registries))
-$(eval $(call gb_Helper_add_repositories,$(gb_REPOS)))
+$(eval $(call gb_Helper_add_repositories,$(SOLARSRC)))
$(eval $(call gb_Helper_collect_libtargets))
gb_Library_DLLPOSTFIX := lo
@@ -194,7 +194,7 @@ endif
include $(GBUILDDIR)/Tempfile.mk
-include $(foreach repo,$(gb_REPOS),$(repo)/RepositoryFixes.mk)
+include $(SOLARSRC)/RepositoryFixes.mk
$(eval $(call gb_Helper_collect_knownlibs))
commit 356536956bb7d6958b942259cf231b25fa89b7cd
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:23:29 2011 +0200
kill multi repo support: ExternalLib
diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk
index 90763f4..c0cff41 100644
--- a/solenv/gbuild/ExternalLib.mk
+++ b/solenv/gbuild/ExternalLib.mk
@@ -26,8 +26,6 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-gb_ExternalLib_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
-
gb_ExternalLib_get_src_package = $(TARFILE_LOCATION)/$(1)
define gb_ExternalLib_ExternalLib
@@ -102,9 +100,9 @@ define gb_ExternalLib__command_autotools
rm -fr $(call gb_ExternalLib_get_workdir,$(1)) && \
mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \
$(GNUTAR) -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \
- cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \
+ cd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$$p || exit 1; done && \
CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(PKG_CONFIG_PATH) $(OUTDIR)/lib/pkgconfig" ./configure $(if $(findstring YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) --prefix=$(OUTDIR) $(T_CONF_ARGS) && \
- for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done
+ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(SOLARSRC)/$p || exit 1; done
#we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ?
cd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i -e 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i -e 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi
+MAKEFLAGS=$(filterout r,$(MAKEFLAGS)) $(MAKE) -C $(call gb_ExternalLib_get_builddir,$(1))
commit 728ad64ad38334158fd2d82de65823ea79a3e08e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:18:50 2011 +0200
kill multi repo support: WinResTarget
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index c9faa8b..931b8bd 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -60,13 +60,13 @@ endef
define gb_WinResTarget_add_file
$(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE=$(gb_Helper_SRCDIR_NATIVE)/$(2).rc
-$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(gb_REPOS),$(realpath $(file)/$(strip $(2)).rc))
+$(call gb_WinResTarget_get_target,$(1)) : RCFILE=$(realpath $(SOLARSRC)/$(strip $(2)).rc)
+$(call gb_WinResTarget_get_target,$(1)) : $(realpath $(SOLARSRC)/$(strip $(2)).rc)
endef
define gb_WinResTarget_add_dependency
-$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(foreach repo,$(gb_REPOS),$(realpath $(repo)/$(strip $(file)))))
+$(call gb_WinResTarget_get_target,$(1)) : $(foreach file,$(2),$(realpath $(SOLARSRC)/$(strip $(file))))
endef
commit 057619fcabd8bd03144d0c456947bd7874509652
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:16:21 2011 +0200
kill multi repo support: SetupLocal can only work with multiple repo support
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 5d9540b..b0233c8 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -26,8 +26,6 @@
#
#*************************************************************************
-gb_ComponentTarget_REPOS := $(gb_REPOS)
-
gb_ComponentTarget_XSLTCOMMANDFILE := $(SOLARENV)/bin/createcomponent.xslt
gb_ComponentTarget_get_source = $(1)/$(2).component
@@ -40,17 +38,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
$(gb_ComponentTarget_XSLTCOMMANDFILE) $(realpath $(2)))
endef
-# creates 2 componentfiles: the first is for the installation set,
-# the second is for using the component during the build.
-# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
-define gb_ComponentTarget__rules
-$$(call gb_ComponentTarget_get_inbuild_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
- $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-$$(call gb_ComponentTarget_get_target,%) : $$(call gb_ComponentTarget_get_source,$(1),%) | $(gb_XSLTPROCTARGET)
- $$(call gb_ComponentTarget__command,$$@,$$<,$$*)
-
-endef
$(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_Output_announce,$*,$(false),CMP,1)
@@ -59,7 +46,15 @@ $(call gb_ComponentTarget_get_clean_target,%) :
$(call gb_ComponentTarget_get_outdir_inbuild_target,$*) \
$(call gb_ComponentTarget_get_inbuild_target,$*) \
-$(foreach repo,$(gb_ComponentTarget_REPOS),$(eval $(call gb_ComponentTarget__rules,$(repo))))
+
+# creates 2 componentfiles: the first is for the installation set,
+# the second is for using the component during the build.
+# bit of a hack, hopefully inbuild can be removed when solver layout is fixed.
+$(call gb_ComponentTarget_get_inbuild_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+ $(call gb_ComponentTarget__command,$@,$<,$*)
+
+$(call gb_ComponentTarget_get_target,%) : $(call gb_ComponentTarget_get_source,$(SOLARSRC),%) | $(gb_XSLTPROCTARGET)
+ $(call gb_ComponentTarget__command,$@,$<,$*)
$(call gb_ComponentTarget_get_target,%) :
$(eval $(call gb_Outpt_error,Unable to find component file $(call gb_ComponentTarget_get_source,,$*) in the repositories: $(gb_ComponentTarget_REPOS) or xsltproc is missing.))
diff --git a/solenv/gbuild/extensions/post_SetupLocal.mk b/solenv/gbuild/extensions/post_SetupLocal.mk
deleted file mode 100644
index 175903c..0000000
--- a/solenv/gbuild/extensions/post_SetupLocal.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-.PHONY : setuplocal removelocal
-ifneq ($(gb_LOCALBUILDDIR),)
-ifneq ($(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk),)
-setuplocal :
- $(eval $(call gb_Output_error,$(gb_LOCALBUILDDIR) exists already.))
-
-else
-
-setuplocal :
- $(eval MODULE := $(firstword $(MODULE) $(lastword $(subst /, ,$(dir $(realpath $(firstword $(MAKEFILE_LIST))))))))
- $(eval modulerepo := $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))))
- $(eval $(call gb_Output_announce,setting up local build directory (module: $(MODULE)).,$(true),SYC,5))
- mkdir -p $(gb_LOCALBUILDDIR)/srcdir $(gb_LOCALBUILDDIR)/workdir $(gb_LOCALBUILDDIR)/outdir
- rsync --archive --exclude 'workdir/**' $(SOLARVERSION)/$(INPATH)/ $(gb_LOCALBUILDDIR)/outdir
- cp $(modulerepo)/Repository.mk $(gb_LOCALBUILDDIR)/srcdir/Repository.mk
- cp $(modulerepo)/RepositoryFixes.mk $(gb_LOCALBUILDDIR)/srcdir/RepositoryFixes.mk
- rsync --archive $(modulerepo)/$(MODULE)/ $(gb_LOCALBUILDDIR)/srcdir/$(MODULE)
- echo "gb_REPOS := $(gb_LOCALBUILDDIR)/srcdir $(filter-out $(patsubst %/$(MODULE),%,$(foreach repo,$(gb_REPOS),$(wildcard $(repo)/$(MODULE)))),$(gb_REPOS))" > $(gb_LOCALBUILDDIR)/SetupLocal.mk
- echo "#original gb_REPOS was $(gb_REPOS)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
- echo "OUTDIR := $(gb_LOCALBUILDDIR)/outdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
- echo "#original OUTDIR was $(OUTDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
- echo "WORKDIR := $(gb_LOCALBUILDDIR)/workdir" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
- echo "#original WORKDIR was $(WORKDIR)" >> $(gb_LOCALBUILDDIR)/SetupLocal.mk
-
-endif
-
-removelocal :
- $(eval $(call gb_Output_warn,removing directory $(gb_LOCALBUILDDIR).,SYC))
- sleep 10
- rm -rf $(gb_LOCALBUILDDIR)
-
-else
-setuplocal:
- $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-removelocal:
- $(eval $(call gb_Output_error,setuplocal: gb_LOCALBUILDDIR is not set.))
-
-endif
-
-# vim: set noet sw=4:
commit 68dd19a368fb4afbf3eba4cb722f56b87f8ea7c1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 17:12:05 2011 +0200
kill multi repo support: LinkTarget
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 345fd4f..5a4737a 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -119,33 +119,24 @@ endif
# CObject class
-gb_CObject_REPOS := $(gb_REPOS)
-
gb_CObject_get_source = $(1)/$(2).c
# defined by platform
# gb_CObject__command
-define gb_CObject__rules
-$$(call gb_CObject_get_target,%) : $$(call gb_CObject_get_source,$(1),%)
- $$(call gb_CObject__command,$$@,$$*,$$<,$$(call gb_CObject_get_dep_target,$$*))
+$(call gb_CObject_get_target,%) : $(call gb_CObject_get_source,$(SOLARSRC),%)
+ $(call gb_CObject__command,$@,$*,$<,$(call gb_CObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CObject_get_dep_target,%) : $$(call gb_CObject_get_target,%)
- $$(if $$(wildcard $$@),touch $$@,\
- $$(call gb_Object__command_dep,$$@,$$(call gb_CObject_get_target,$$*)))
+$(call gb_CObject_get_dep_target,%) : $(call gb_CObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_CObject_get_target,$*)))
endif
-endef
-
-$(foreach repo,$(gb_CObject_REPOS),$(eval $(call gb_CObject__rules,$(repo))))
-
gb_CObject_CObject =
# CxxObject class
-gb_CxxObject_REPOS := $(gb_REPOS)
-
gb_CxxObject_get_source = $(1)/$(2).cxx
# defined by platform
# gb_CxxObject__command
@@ -178,22 +169,17 @@ endif
endif
endef
-define gb_CxxObject__rules
-$$(call gb_CxxObject_get_target,%) : $$(call gb_CxxObject_get_source,$(1),%)
- $$(eval $$(gb_CxxObject__set_pchflags))
- $$(call gb_CxxObject__command,$$@,$$*,$$<,$$(call gb_CxxObject_get_dep_target,$$*))
+$(call gb_CxxObject_get_target,%) : $(call gb_CxxObject_get_source,$(SOLARSRC),%)
+ $(eval $(gb_CxxObject__set_pchflags))
+ $(call gb_CxxObject__command,$@,$*,$<,$(call gb_CxxObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_CxxObject_get_dep_target,%) : $$(call gb_CxxObject_get_target,%)
- $$(if $$(wildcard $$@),touch $$@,\
- $$(eval $$(gb_CxxObject__set_pchflags))\
- $$(call gb_Object__command_dep,$$@,$$(call gb_CxxObject_get_target,$$*)))
+$(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(eval $(gb_CxxObject__set_pchflags))\
+ $(call gb_Object__command_dep,$@,$(call gb_CxxObject_get_target,$*)))
endif
-endef
-
-$(foreach repo,$(gb_CxxObject_REPOS),$(eval $(call gb_CxxObject__rules,$(repo))))
-
gb_CxxObject_CxxObject =
@@ -248,8 +234,8 @@ gb_YaccObject__get_generated_source = $(WORKDIR)/$(1).cxx
define gb_YaccObject_YaccObject
$(call gb_YaccObject_get_target,$(1)) : $(call gb_YaccObject__get_generated_source,$(1)) $(call gb_YaccObject_get_header_target,$(1))
$(call gb_YaccObject_get_header_target,$(1)) :| $(call gb_YaccObject__get_generated_source,$(1))
-$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(gb_REPOS),$(1))
- $$(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(gb_REPOS),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
+$(call gb_YaccObject__get_generated_source,$(1)) : $(call gb_YaccObject_get_source,$(SOLARSRC),$(1))
+ $(call gb_YaccObject__command,$(call gb_YaccObject_get_source,$(SOLARSRC),$(1)),$(1),$(call gb_YaccObject__get_generated_source,$(1)),$(call gb_YaccObject_get_header_target,$(1)))
endef
gb_YACC := bison
@@ -260,31 +246,23 @@ gb_YACC := bison
# ObjCxxObject class
#
-gb_ObjCxxObject_REPOS := $(gb_REPOS)
-gb_ObjCxxObject_get_source = $(1)/$(2).mm
# defined by platform
# gb_ObjCxxObject__command
-define gb_ObjCxxObject__rules
-$$(call gb_ObjCxxObject_get_target,%) : $$(call gb_ObjCxxObject_get_source,$(1),%)
- $$(call gb_ObjCxxObject__command,$$@,$$*,$$<,$$(call gb_ObjCxxObject_get_dep_target,$$*))
+$(call gb_ObjCxxObject_get_target,%) : $(call gb_ObjCxxObject_get_source,$(1),%)
+ $(call gb_ObjCxxObject__command,$@,$*,$<,$(call gb_ObjCxxObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCxxObject_get_dep_target,%) : $$(call gb_ObjCxxObject_get_target,%)
- $$(if $$(wildcard $$@),touch $$@,\
- $$(call gb_Object__command_dep,$$@,$$(call gb_ObjCxxObject_get_target,$$*)))
+$(call gb_ObjCxxObject_get_dep_target,%) : $(call gb_ObjCxxObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_ObjCxxObject_get_target,$*)))
endif
-endef
-
-$(foreach repo,$(gb_ObjCxxObject_REPOS),$(eval $(call gb_ObjCxxObject__rules,$(repo))))
-
gb_ObjCxxObject_ObjCxxObject =
# ObjCObject class
#
-gb_ObjCObject_REPOS := $(gb_REPOS)
gb_ObjCObject_get_source = $(1)/$(2).m
# defined by platform
@@ -302,45 +280,33 @@ else
gb_ObjCObject__command_dep =
endif
-define gb_ObjCObject__rules
-$$(call gb_ObjCObject_get_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
- $$(call gb_ObjCObject__command,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+$(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+ $(call gb_ObjCObject__command,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_ObjCObject_get_dep_target,%) : $$(call gb_ObjCObject_get_source,$(1),%)
- $$(call gb_ObjCObject__command_dep,$$@,$$*,$$<,$$(DEFS),$$(OBJCFLAGS),$$(INCLUDE_STL) $$(INCLUDE))
+$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SOLARSRC),%)
+ $(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE))
endif
-endef
-
-$(foreach repo,$(gb_ObjCObject_REPOS),$(eval $(call gb_ObjCObject__rules,$(repo))))
-
gb_ObjCObject_ObjCObject =
# AsmObject class
-gb_AsmObject_REPOS := $(gb_REPOS)
-
# defined by platform
# gb_AsmObject_get_source (.asm on Windows, .s elsewhere)
# gb_AsmObject__command
-define gb_AsmObject__rules
-$$(call gb_AsmObject_get_target,%) : $$(call gb_AsmObject_get_source,$(1),%)
- $$(call gb_AsmObject__command,$$@,$$*,$$<,$$(call gb_AsmObject_get_dep_target,$$*))
+$(call gb_AsmObject_get_target,%) : $(call gb_AsmObject_get_source,$(SOLARSRC),%)
+ $(call gb_AsmObject__command,$@,$*,$<,$(call gb_AsmObject_get_dep_target,$*))
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_AsmObject_get_dep_target,%) : $$(call gb_AsmObject_get_target,%)
- $$(if $$(wildcard $$@),touch $$@,\
- $$(call gb_Object__command_dep,$$@,$$(call gb_AsmObject_get_target,$$*)))
+$(call gb_AsmObject_get_dep_target,%) : $(call gb_AsmObject_get_target,%)
+ $(if $(wildcard $@),touch $@,\
+ $(call gb_Object__command_dep,$@,$(call gb_AsmObject_get_target,$*)))
endif
-endef
-
-$(foreach repo,$(gb_AsmObject_REPOS),$(eval $(call gb_AsmObject__rules,$(repo))))
-
gb_AsmObject_AsmObject =
commit 46e512987a13b7df215174c5a1b33432b2181086
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 16:54:18 2011 +0200
kill multi repo support: UnoApiTarget
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 3f87fae..03dd8ef 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -66,8 +66,7 @@ endef
define gb_UnoApiTarget_add_idlfiles
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : \
- $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -87,8 +86,7 @@ endef
define gb_UnoApiTarget_add_idlfiles_noheader
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_noheader,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : \
- $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_noheader.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -103,8 +101,7 @@ endef
define gb_UnoApiTarget_add_idlfiles_nohdl
$(foreach idl,$(3),$(call gb_UnoApiTarget_add_idlfile_nohdl,$(1),$(2),$(idl)))
-$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : \
- $(foreach idl,$(3),$($(gb_UnoApiTarget_REPO_$(1)))/$(2)/$(idl).idl)
+$(call gb_UnoApiPartTarget_get_target,$(2)/idl_nohdl.done) : $(foreach idl,$(3),$(SOLARSRC)/$(2)/$(idl).idl)
$(gb_UnoApiPartTarget__command)
endef
@@ -144,8 +141,7 @@ $(call gb_UnoApiTarget_get_target,$(1)) : $(call gb_UnoApiOutTarget_get_target,$
endef
define gb_UnoApiTarget_add_reference_rdbfile
-$(call gb_UnoApiTarget_get_target,$(1)) : \
- UNOAPI_REFERENCE := $($(gb_UnoApiTarget_REPO_$(1)))/$(strip $(2)).rdb
+$(call gb_UnoApiTarget_get_target,$(1)) : UNOAPI_REFERENCE := $(SOLARSRC)/$(strip $(2)).rdb
endef
commit 191ae70bb04d15a3d349dfb22c3ddd098b7cc418
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Oct 21 16:45:15 2011 +0200
kill multi repo support: AllLangResTarget
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index c760426..3506a63 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -52,7 +52,6 @@ gb_SrsPartMergeTarget_TRANSEXTARGET := $(call gb_Executable_get_target_for_build
gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_SrsPartMergeTarget_TRANSEXPRECOMMAND) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
gb_SrsPartMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/
-gb_SrsPartMergeTarget_REPOS := $(gb_REPOS)
define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1)
@@ -67,17 +66,12 @@ $(call gb_Helper_abbreviate_dirs_native,\
endef
-define gb_SrsPartMergeTarget__rules
-$$(call gb_SrsPartMergeTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartMergeTarget_TRANSEXTARGET)
- $$(if $$(SDF),$$(call gb_SrsPartMergeTarget__command,$$@,$$*,$$<),mkdir -p $$(dir $$@) && cp $$< $$@)
+$(call gb_SrsPartMergeTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartMergeTarget_TRANSEXTARGET)
+ $(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p $(dir $@) && cp $< $@)
-endef
-
-$(foreach repo,$(gb_SrsPartMergeTarget_REPOS),$(eval $(call gb_SrsPartMergeTarget__rules,$(repo))))
# SrsPartTarget class
-gb_SrsPartTarget_REPOS := $(gb_REPOS)
# defined by platform
# gb_SrsPartTarget_RSCTARGET
# gb_SrsPartTarget_RSCCOMMAND
@@ -98,23 +92,16 @@ $(call gb_Helper_abbreviate_dirs_native,\
endef
-define gb_SrsPartTarget__rules
-$$(call gb_SrsPartTarget_get_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY) | $$(gb_SrsPartTarget_RSCTARGET)
- $$(call gb_SrsPartTarget__command_dep,$$*,$$<)
- $$(call gb_SrsPartTarget__command,$$@,$$*,$$<)
+$(call gb_SrsPartTarget_get_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY) | $(gb_SrsPartTarget_RSCTARGET)
+ $(call gb_SrsPartTarget__command_dep,$*,$<)
+ $(call gb_SrsPartTarget__command,$@,$*,$<)
ifeq ($(gb_FULLDEPS),$(true))
-$$(call gb_SrsPartTarget_get_dep_target,%) : $(1)/% $$(gb_Helper_MISCDUMMY)
- $$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $$(dir $$@) && \
- echo '$$(call gb_SrsPartTarget_get_target,$$*) : $$(gb_Helper_PHONY)' > $$@)
-endif
-
-endef
-
-$(foreach repo,$(gb_SrsPartTarget_REPOS),$(eval $(call gb_SrsPartTarget__rules,$(repo))))
+$(call gb_SrsPartTarget_get_dep_target,%) : $(SOLARSRC)/% $(gb_Helper_MISCDUMMY)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && \
+ echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@)
-ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsPartTarget_get_dep_target,%) :
$(eval $(call gb_Output_error,Unable to find resource definition file $* in repositories: $(gb_SrsPartTarget_REPOS)))
endif
More information about the Libreoffice-commits
mailing list