[Libreoffice-commits] .: Branch 'feature/soenv2' - 6 commits - configure.in Makefile solenv/gbuild
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Thu Jan 26 00:48:18 PST 2012
Makefile | 8 ++++++
configure.in | 30 ++++++++++++++----------
solenv/gbuild/extensions/post_BuildplTargets.mk | 2 -
solenv/gbuild/gbuild.mk | 12 ++++++++-
solenv/gbuild/platform/WNT_INTEL_MSC.mk | 6 ++--
5 files changed, 40 insertions(+), 18 deletions(-)
New commits:
commit 4a17f9e1bc9bc1871bce66d9a25bef7f4b3d3405
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Jan 26 02:32:45 2012 -0600
gb_WinResTarget__command never has 3 parameters
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 6781672..dce6227 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -673,7 +673,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
mkdir -p $(dir $(1)) && \
$(gb_RC) \
$(DEFS) $(FLAGS) \
- -I$(dir $(3)) \
$(INCLUDE) \
-Fo$(1) \
$(RCFILE) )
commit a5209d8760295b9ed8dbaed3f04e9ea95581fbaf
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Jan 26 02:31:08 2012 -0600
gb_Helper_convert_native should not introduce superflous spaces
that broke a case where we had -DMISC=$(call gb_Helper_conver_native,...)
which transformed in to -DMISC= d:/foo/bar
and broke the build
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index ada5df8..6781672 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -251,6 +251,7 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
# slashes after file: in a file: URL from being unduplicated by the
# // -> / substitution.
define gb_Helper_convert_native
+$(strip \
$(subst file:!!!,file:///, \
$(subst //,/, \
$(subst file:///,file:!!!, \
@@ -258,7 +259,7 @@ $(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))))))))
+$(1)))))))))
endef
# YaccTarget class
commit b5278f1155bd111e43417dfed7af3efba0adf65b
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Thu Jan 26 02:28:45 2012 -0600
REPODIR could be a drive i.e D:/ in that case we want to strip the '/'
otherwise we construct file like d://libo/... which break stuf
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 7552f09..ada5df8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -239,7 +239,7 @@ endif
gb_Helper_SRCDIR_NATIVE := $(shell cygpath -m $(SRCDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
gb_Helper_WORKDIR_NATIVE := $(shell cygpath -m $(WORKDIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }')
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) }')
+gb_Helper_REPODIR_NATIVE := $(shell cygpath -m $(REPODIR) | $(gb_AWK) -- '{ print tolower(substr($$0,1,1)) substr($$0,2) }' | sed -e 's,\:/$$,:,')
gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
commit a6ecc6f8e660735262382e14084ef09efa7fbfa7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 25 17:24:04 2012 -0600
adjust gbuild doc
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1633bd9..8b4c162 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -373,6 +373,14 @@ AVAILABLE TARGETS
showdeliverables show the targets delivered to OUTDIR and their source
debugrun starts the dev-install instance and allows tests to be run
against it
+ <module> build the named module
+ <module>.clean clean the named module
+ <module>.all for dmake modules only, build the named module and
+ the pre-requisite modules for this module
+ <module>.deliver for dmake modules only, deliver the named module
+ cmd execute the command contained in the variable cmd=""
+ in a shell with config_host.mk or config_build.mk
+ environement set. (see gb_SIDE)
INTERACTIVE VARIABLES:
DEBUG / debug If not empty, build with DBGLEVEL=1 (see below).
@@ -400,7 +408,9 @@ INTERACTIVE VARIABLES:
gb_FULLDEPS Generate and use dependencies (on by default, handle with care).
gb_COLOR Use ASCII color output.
gb_TITLES Show progress in terminal title.
-
+ gb_Side Either "host" of "build" (default to "host").
+ determine if config_host.mk or config_build.mk is used to
+ set the build environment.
endef
.PHONY: help
commit a3feef7afd523fd1ede618d6cba4a283dcc65bb1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 25 17:23:51 2012 -0600
fixes for windows build for config_host.mk based build
diff --git a/configure.in b/configure.in
index 6929c88..f38c33e 100644
--- a/configure.in
+++ b/configure.in
@@ -1915,18 +1915,19 @@ pathmunge ()
{
if test -n "$1" ; then
if test "$build_os" = "cygwin" ; then
- WinPath "$1"
+ PathFormat "$1"
new_path=`cygpath -u "$formatted_path"`
else
new_path="$1"
fi
if ! echo LO_PATH | $EGREP -q "(^|:)$1($|:)" ; then
if test "$2" = "after" ; then
- LO_PATH="$LO_PATH:$1"
+ LO_PATH="$LO_PATH:$new_path"
else
- LO_PATH="$1:$LO_PATH"
+ LO_PATH="$new_path:$LO_PATH"
fi
fi
+ unset new_path
fi
}
@@ -6967,7 +6968,7 @@ if test "$SYSTEM_MOZILLA" = "YES" ; then
fi
AC_SUBST(BUILD_MOZAB)
-AC_SUBST(PREBUILT_MOZAB)
+AC_SUBST(PREBUILD_MOZAB)
AC_SUBST(MOZILLABUILD)
AC_SUBST(SYSTEM_MOZILLA)
AC_SUBST(MOZ_FLAVOUR)
@@ -7870,7 +7871,7 @@ if test "$_os" = "WINNT" -a "$WITH_MINGW" != "yes"; then
ML_EXE="$assembler"
fi
fi
- FormatPath "$with_asm_home"
+ PathFormat "$with_asm_home"
ASM_HOME="$formatted_path"
else
ASM_HOME=""
@@ -9962,6 +9963,7 @@ EOF
ANT="$ANT"
fi
AC_SUBST(ANT_HOME)
+ AC_SUBST(ANT)
dnl Checking for ant.jar
if test "$ANT_HOME" != "NO_ANT_HOME"; then
@@ -10558,14 +10560,14 @@ if test "$build_os" = "cygwin"; then
ILIB="$ILIB;$formatted_path"
fi
if test "$CL_X64" = "TRUE" ; then
- WinPath "$COMPATH/lib"
+ WinPath "$COMPATH/lib/amd64"
ILIB="$ILIB;$formatted_path"
- WinPath "$WINDOWS_SDK_HOME/lib"
+ WinPath "$WINDOWS_SDK_HOME/lib64"
ILIB="$ILIB;$formatted_path"
else
- WinPath "$COMPATH/lib/amd64"
+ WinPath "$COMPATH/lib"
ILIB="$ILIB;$formatted_path"
- WinPath "$WINDOWS_SDK_HOME/lib64"
+ WinPath "$WINDOWS_SDK_HOME/lib"
ILIB="$ILIB;$formatted_path"
fi
WinPath "$DOTNET_FRAMEWORK_HOME/lib"
@@ -10679,6 +10681,10 @@ AC_SUBST(ATL_INCLUDE)
AC_SUBST(ATL_LIB)
AC_SUBST(MFC_INCLUDE)
AC_SUBST(MFC_LIB)
+AC_SUBST(WIND_FIND)
+AC_SUBST(WIND_GREP)
+AC_SUBST(WIND_LS)
+AC_SUBST(WIND_TOUCH)
AC_SUBST(BUILD_TYPE)
@@ -10746,13 +10752,13 @@ else
cygwin*)
if test "$SOLAR_JAVA" != "" -a "$JDK"!="gcj"; then
- pathmunge "$DOTNET_FRAMEWORK_HOME" "before"
+ pathmunge "$DOTNET_FRAMEWORK_HOME/bin" "before"
pathmunge "$ASM_HOME" "before"
- pathmunge "$WINDOWS_SDK_HOME" "before"
+ pathmunge "$WINDOWS_SDK_HOME/bin" "before"
pathmunge "$CSC_PATH" "before"
pathmunge "$MIDL_PATH" "before"
pathmunge "$MSPDB_PATH" "before"
- if test "$CL_X64"="TRUE" ; then
+ if test "$CL_X64" = "TRUE" ; then
pathmunge "$COMPATH/bin/amd64" "before"
else
pathmunge "$COMPATH/bin" "before"
diff --git a/solenv/gbuild/extensions/post_BuildplTargets.mk b/solenv/gbuild/extensions/post_BuildplTargets.mk
index 3c4e098..fa812ad 100644
--- a/solenv/gbuild/extensions/post_BuildplTargets.mk
+++ b/solenv/gbuild/extensions/post_BuildplTargets.mk
@@ -159,8 +159,6 @@ endif # gb_SourceEnvAndRecurse_STAGE=buildpl
ifeq ($(gb_SourceEnvAndRecurse_STAGE),gbuild)
-clean: clean-host clean-build
-
dev-install: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset) | $(filter build,$(MAKECMDGOALS))
build: $(WORKDIR)/bootstrap $(SRCDIR)/src.downloaded $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross_toolset)
commit 58e5eb733d694a50cd8b73d5add6ce2c45fa2e3c
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Wed Jan 25 17:22:58 2012 -0600
add cmd target to deal with corner case operations
diff --git a/Makefile b/Makefile
index b6ea167..3508676 100644
--- a/Makefile
+++ b/Makefile
@@ -316,6 +316,14 @@ endif
desktop/scripts/soffice.sh ooo.lst post_download post_download.log \
config_host.mk.last set_soenv.stamp src.downloaded warn
+#
+# custum command
+#
+ifneq ( $(MAKECMDGOALS),cmd)
+cmd:
+ echo "custum cmd" && ( $(cmd) )
+
+endif
#
# Bootstap
More information about the Libreoffice-commits
mailing list