[Libreoffice-commits] .: Branch 'feature/gbuildfixes' - 7 commits - i18npool/source Makefile RepositoryModule_ooo.mk solenv/gbuild tools/source
Bjoern Michaelsen
bmichaelsen at kemper.freedesktop.org
Fri Dec 2 06:08:51 PST 2011
Makefile | 21 ++++++++-------------
RepositoryModule_ooo.mk | 6 ++++++
i18npool/source/breakiterator/Makefile | 10 +++++-----
i18npool/source/collator/Makefile | 4 ++--
i18npool/source/indexentry/Makefile | 4 ++--
i18npool/source/localedata/Makefile | 8 ++++----
i18npool/source/textconversion/Makefile | 4 ++--
solenv/gbuild/CustomTarget.mk | 1 -
solenv/gbuild/extensions/post_AuxTargets.mk | 2 +-
solenv/gbuild/gbuild.mk | 2 +-
solenv/gbuild/platform/com_GCC_class.mk | 4 ++--
solenv/gbuild/source_and_rerun.mk | 2 +-
tools/source/reversemap/Makefile | 5 +++--
13 files changed, 37 insertions(+), 36 deletions(-)
New commits:
commit e5ea900b9da28d509f701115150b09b8a1e585a5
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:49:29 2011 +0100
silent recurse
diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk
index 46e6d43..a2aaea0 100644
--- a/solenv/gbuild/source_and_rerun.mk
+++ b/solenv/gbuild/source_and_rerun.mk
@@ -20,7 +20,7 @@ gb_SourceEnvAndRecurse_buildpl=$(call gb_SourceEnvAndRecurse_recurse,$(MAKECMDGO
endif
source-env-and-recurse:
- $(gb_SourceEnvAndRecurse_reconfigure) && \
+ @$(gb_SourceEnvAndRecurse_reconfigure) && \
if test -f $(SRCDIR)/config.mk ; then . $(SRCDIR)/config.mk; fi && \
if test -f $(SRCDIR)/Env.Host.sh; then . $(SRCDIR)/Env.Host.sh; fi && \
if test -z "$${SOLARENV}"; then echo "no configuration found and could not create one" && exit 1; fi && \
commit e4fbca1a513af15fd6c70929e3d5e53c06b93d89
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:49:04 2011 +0100
always compile from SRCDIR
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 61afbc1..87d9364 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -27,7 +27,7 @@
define gb_CObject__command
$(call gb_Output_announce,$(2),$(true),C ,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CC) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
@@ -46,7 +46,7 @@ endef
define gb_CxxObject__command
$(call gb_Output_announce,$(2),$(true),CXX,3)
$(call gb_Helper_abbreviate_dirs,\
- mkdir -p $(dir $(1)) $(dir $(4)) && \
+ mkdir -p $(dir $(1)) $(dir $(4)) && cd $(SRCDIR) && \
$(gb_CXX) \
$(DEFS) \
$(if $(filter Library,$(TARGETTYPE)),$(gb_Library_LTOFLAGS)) \
commit 429ab808ee6d897c8af9f86a02c9bbdfbcf96eea
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:47:00 2011 +0100
kill gb_MINISOLARENV in favor of stages
diff --git a/Makefile b/Makefile
index d40695c..9f6c897 100644
--- a/Makefile
+++ b/Makefile
@@ -26,23 +26,18 @@
#
#*************************************************************************
-gb_SOURCEANDRERUN:=
-SRCDIR:=$(realpath $(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
-ifeq ($(strip $(SOLARENV)),)
-ifneq ($(MAKECMDGOALS),$(SRCDIR)/Env.Host.sh)
-gb_SOURCEANDRERUN:=T
-gb_MINISOLARENV:=
-else
-SOLARENV:=$(SRCDIR)/solenv
-gb_MINISOLARENV:=T
+SRCDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+
+ifeq ($(strip $(gb_SourceEnvAndRecurse_STAGE)),)
+include $(SRCDIR)/solenv/gbuild/source_and_rerun.mk
endif
+
+ifeq ($(gb_SourceEnvAndRecurse_STAGE),reconfigure)
+SOLARENV:=$(SRCDIR)/solenv
endif
-ifneq ($(gb_SOURCEANDRERUN),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk
-else
+ifneq ($(filter reconfigure gbuild buildpl,$(gb_SourceEnvAndRecurse_STAGE)),)
include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk)))
endif
-
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk
index b8a002f..ce4a5cb 100644
--- a/solenv/gbuild/extensions/post_AuxTargets.mk
+++ b/solenv/gbuild/extensions/post_AuxTargets.mk
@@ -50,7 +50,7 @@ fetch: $(SRCDIR)/src.downloaded
# fixme: can we prevent these exports in the first place?
$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in
- $(if $(gb_MINISOLARENV),$(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
+ $(if $(filter reconfigure,$(gb_SourceEnvAndRecurse_STAGE)),$(SRCDIR)/autogen.sh, at echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2)
$(WORKDIR)/bootstrap:
@cd $(SRCDIR) && ./bootstrap
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9f0b32b..e85ed83 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -151,7 +151,7 @@ $(eval $(call gb_Helper_collect_libtargets))
gb_Library_DLLPOSTFIX := lo
# Include platform/cpu/compiler specific config/definitions
-ifeq ($(strip $(gb_MINISOLARENV)),)
+ifneq ($(filter gbuild buidpl,$(gb_SourceEnvAndRecurse_STAGE)),)
include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
endif
commit b7dde57710fd88c636f68fed1c249d4c09140af4
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:44:47 2011 +0100
no need to export gb_Helper*, use gbuild_simple instead
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index c55e6d8..88e5f99 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -31,7 +31,6 @@ define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
gb_AWK=$(gb_AWK) gb_XSLTPROC=$(gb_XSLTPROC) GBUILDDIR=$(GBUILDDIR) SRCDIR=$(SRCDIR) \
- gb_Helper_set_ld_path=$(gb_Helper_set_ld_path) gb_Helper_execute=$(gb_Helper_execute) \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))
commit 48ad36e8cea8c0003cb00ce1fd24fa16345f7284
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:43:26 2011 +0100
use gbuild_simple.mk in i18npool
diff --git a/i18npool/source/breakiterator/Makefile b/i18npool/source/breakiterator/Makefile
index 9f1a6ce..b34217a 100644
--- a/i18npool/source/breakiterator/Makefile
+++ b/i18npool/source/breakiterator/Makefile
@@ -39,25 +39,25 @@ data/dict_%.cxx : data/dict_%_invis.cxx
data/dict_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/breakiterator/data)/%.dic data
ifeq ($(OS_FOR_BUILD),WNT)
- $(gb_Helper_execute)gendict `cygpath -m $<` $@
+ $(call gb_Helper_execute,gendict `cygpath -m $<` $@)
else
- $(gb_Helper_execute)gendict $< $@
+ $(call gb_Helper_execute,gendict $< $@)
endif
ifeq ($(SYSTEM_GENBRK),)
-GENBRK := $(gb_Helper_execute)genbrk
+GENBRK := $(call gb_Helper_execute,genbrk)
else
GENBRK := $(SYSTEM_GENBRK)
endif
ifeq ($(SYSTEM_GENCCODE),)
-GENCCODE := $(gb_Helper_execute)genccode
+GENCCODE := $(call gb_Helper_execute,genccode)
else
GENCCODE := $(SYSTEM_GENCCODE)
endif
ifeq ($(SYSTEM_GENCMN),)
-GENCMN := $(gb_Helper_execute)gencmn
+GENCMN := $(call gb_Helper_execute,gencmn)
else
GENCMN := $(SYSTEM_GENCMN)
endif
diff --git a/i18npool/source/collator/Makefile b/i18npool/source/collator/Makefile
index 2c2c891..fb9a8dc 100644
--- a/i18npool/source/collator/Makefile
+++ b/i18npool/source/collator/Makefile
@@ -37,9 +37,9 @@ collator_%.cxx : collator_%_invis.cxx
collator_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/collator/data)/%.txt
ifeq ($(OS_FOR_BUILD),WNT)
- $(gb_Helper_execute)gencoll_rule `cygpath -m $<` $@ $*
+ $(call gb_Helper_execute,gencoll_rule `cygpath -m $<` $@ $*)
else
- $(gb_Helper_execute)gencoll_rule $< $@ $*
+ $(call gb_Helper_execute,gencoll_rule $< $@ $*)
endif
lrl_include.hxx : $(txtlist)
diff --git a/i18npool/source/indexentry/Makefile b/i18npool/source/indexentry/Makefile
index cb0212c..dac5c27 100644
--- a/i18npool/source/indexentry/Makefile
+++ b/i18npool/source/indexentry/Makefile
@@ -36,9 +36,9 @@ include $(GBUILDDIR)/gbuild_simple.mk
%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/indexentry/data)/%.txt
ifeq ($(OS_FOR_BUILD),WNT)
- $(gb_Helper_execute)genindex_data `cygpath -m $<` $@ $*
+ $(call gb_Helper_execute,genindex_data `cygpath -m $<` $@ $*)
else
- $(gb_Helper_execute)genindex_data $< $@ $*
+ $(call gb_Helper_execute,genindex_data $< $@ $*)
endif
.PHONY: all
diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile
index 336eb67..618db65 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -40,15 +40,15 @@ localedata_%.cxx : localedata_%_invis.cxx
ifeq ($(OS_FOR_BUILD),WNT)
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR)/bin/saxparser$(gb_Executable_EXT)
- $(gb_Helper_execute)saxparser $* `cygpath -m $<` $@ \
+ $(call gb_Helper_execute,saxparser $* `cygpath -m $<` $@ \
$(my_file)`cygpath -m $(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb` `cygpath -m $(OUTDIR)/bin/types.rdb` \
- -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`
+ -env:LO_LIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`)
else
localedata_%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/localedata/data)/%.xml saxparser.rdb \
$(OUTDIR_FOR_BUILD)/bin/saxparser$(gb_Executable_EXT_for_build)
- $(gb_Helper_execute)saxparser $* $< $@ \
+ $(call gb_Helper_execute,saxparser $* $< $@ \
$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \
- -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib
+ -env:LO_LIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib)
endif
saxparser.rdb : saxparser.input
diff --git a/i18npool/source/textconversion/Makefile b/i18npool/source/textconversion/Makefile
index 97e0e2d..872c099 100755
--- a/i18npool/source/textconversion/Makefile
+++ b/i18npool/source/textconversion/Makefile
@@ -36,9 +36,9 @@ include $(GBUILDDIR)/gbuild_simple.mk
%_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/textconversion/data)/%.dic
ifeq ($(OS_FOR_BUILD),WNT)
- $(gb_Helper_execute)genconv_dict $* `cygpath -m $<` $@
+ $(call gb_Helper_execute,genconv_dict $* `cygpath -m $<` $@)
else
- $(gb_Helper_execute)genconv_dict $* $< $@
+ $(call gb_Helper_execute,genconv_dict $* $< $@)
endif
commit d45a34c3ddcf992eaa06ec5d52d31c282af4a137
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:42:27 2011 +0100
add missing modules to RepositoryModule_ooo.mk
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index e7049f7..cebcb5b 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -30,6 +30,7 @@ $(eval $(call gb_Module_Module,ooo))
$(eval $(call gb_Module_add_moduledirs,ooo,\
animations \
+ automation \
basctl \
basebmp \
basegfx \
@@ -47,6 +48,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
editeng \
eventattacher \
fileaccess \
+ filter \
forms \
formula \
framework \
@@ -63,6 +65,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
offapi \
oovbaapi \
oox \
+ package \
padmin \
psprint_config \
qadevOOo \
@@ -73,6 +76,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
sc \
scaddins \
sccomp \
+ scripting \
sd \
sfx2 \
slideshow \
@@ -92,12 +96,14 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
unixODBC \
unotools \
unoxml \
+ uui \
vbahelper \
vcl \
wizards \
writerfilter \
writerperfect \
xmerge \
+ xmlsecurity \
xml2cmp \
xmloff \
xmlreader \
commit f101bfaf9bf95669992bc697d275f9f1c16599da
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Dec 2 14:41:35 2011 +0100
use gbuild_simple in tools
diff --git a/tools/source/reversemap/Makefile b/tools/source/reversemap/Makefile
index a88b395..5b427a8 100644
--- a/tools/source/reversemap/Makefile
+++ b/tools/source/reversemap/Makefile
@@ -25,8 +25,9 @@
all : reversemap.hxx
+include $(GBUILDDIR)/gbuild_simple.mk
+
reversemap.hxx : $(OUTDIR_FOR_BUILD)/bin/bestreversemap
- $(gb_Helper_execute)bestreversemap > $@
+ $(call gb_Helper_execute,bestreversemap > $@)
-.PHONY : all
# vim: set noet sw=4 ts=4:
More information about the Libreoffice-commits
mailing list