solenv/gbuild/Helper.mk | 4 ++++ solenv/gbuild/UnoApiTarget.mk | 11 ++++------- solenv/gbuild/platform/WNT_INTEL_MSC.mk | 13 ++++--------- solenv/gbuild/platform/com_GCC_defs.mk | 2 -- solenv/gbuild/platform/solaris.mk | 4 +--- 5 files changed, 13 insertions(+), 21 deletions(-)
New commits: commit 82633cdad36083e537886b832483f4e73263735a Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sun Jan 15 15:04:07 2012 +0100 gbuild: simplify gb_Helper_abbreviate_dirs* diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 84e6cd9..9655424 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -47,6 +47,10 @@ $(subst $(SRCDIR)/,$$S/,O=$(OUTDIR)) && \ $(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,W=$(WORKDIR) && $(subst $(WORKDIR)/,$$W/,$(1))))) endef +define gb_Helper_abbreviate_dirs_native +$(call gb_Helper_convert_native,$(call gb_Helper_abbreviate_dirs,$(1))) +endef + define gb_Helper_make_clean_target gb_$(1)_get_clean_target = $(WORKDIR)/Clean/$(1)/$$(1) diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 4aa2a91..e0d6f12 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -241,11 +241,6 @@ gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ prin gb_Helper_OUTDIR_NATIVE := $(shell cygpath -m $(OUTDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }') -define gb_Helper_abbreviate_dirs_native -R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,O=$(gb_Helper_OUTDIR_NATIVE) && W=$(gb_Helper_WORKDIR_NATIVE) && S=$(gb_Helper_SRCDIR_NATIVE))) && \ -$(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1))))))))) -endef - gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin" # convert parameters filesystem root to native notation diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 33aa936..9e055ed 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -160,5 +160,3 @@ $(1) endef gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/lib - -gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index afb9629..c826bea 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -139,8 +139,6 @@ gb_COMPILERNOOPTFLAGS := # Helper class -gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) - gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib # $(1): list of directory pathnames to append at the end of the ld path @@ -382,7 +380,7 @@ endef # Sun cc/CC support -xM1/-xMF flags, but unfortunately refuse input files that # do not have the right suffix, so use makedepend here... define gb_SrsPartTarget__command_dep -$(call gb_Helper_abbreviate_dirs_native,\ +$(call gb_Helper_abbreviate_dirs,\ $(OUTDIR)/bin/makedepend$(gb_Executable_EXT) \ $(INCLUDE) \ $(DEFS) \ commit 39c347b2d9ffe285160e13207a4df79d0972cbce Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sun Jan 15 14:38:37 2012 +0100 gbuild: platform/WNT_INTEL_MSC: use subst in gb_Helper_convert_native diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 0c953f1..4aa2a91 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -252,10 +252,10 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin" # does some real work only on windows, make sure not to # break the dummy implementations on unx* define gb_Helper_convert_native -$(patsubst -I$(OUTDIR)%,-I$(gb_Helper_OUTDIR_NATIVE)%, \ -$(patsubst $(OUTDIR)%,$(gb_Helper_OUTDIR_NATIVE)%, \ -$(patsubst $(WORKDIR)%,$(gb_Helper_WORKDIR_NATIVE)%, \ -$(patsubst $(SRCDIR)%,$(gb_Helper_SRCDIR_NATIVE)%, \ +$(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \ +$(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \ +$(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \ +$(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \ $(1))))) endef commit 6cd9c42eb69202bb16b975e227f8870729465fbc Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sun Jan 15 14:33:10 2012 +0100 gbuild: UnoApiTarget: refactor slightly diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 426d967..704659b 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -225,15 +225,12 @@ define gb_UnoApiTarget__command endef define gb_UnoApiHeaderTarget__command -$(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - mkdir -p $(gb_Helper_MISC) && \ - RESPONSEFILE=`$(gb_MKTEMP)` && \ - echo " -Gc -L -BUCR -O$(call gb_UnoApiTarget_get_header_target,$(2)) $(3) \ - $(1) \ - " > $${RESPONSEFILE} && \ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),100,\ + $(call gb_Helper_convert_native,-Gc -L -BUCR \ + -O$(call gb_UnoApiTarget_get_header_target,$(2)) $(3) $(1))) && \ $(gb_UnoApiTarget_CPPUMAKERCOMMAND) @$${RESPONSEFILE} && \ - rm -f $${RESPONSEFILE}) + rm -f $${RESPONSEFILE} endef
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits