[Libreoffice-commits] .: 4 commits - configure.ac solenv/gbuild
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Jan 1 00:02:56 PST 2013
configure.ac | 16 +++++++++++++---
solenv/gbuild/AllLangResTarget.mk | 4 ++--
solenv/gbuild/Helper.mk | 2 +-
solenv/gbuild/InstallModuleTarget.mk | 2 +-
solenv/gbuild/SdiTarget.mk | 2 +-
solenv/gbuild/TargetLocations.mk | 10 ++--------
6 files changed, 20 insertions(+), 16 deletions(-)
New commits:
commit 00234d0578419c3d0847dd89554186146121f60e
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 1 08:59:17 2013 +0100
replace bashisms
Change-Id: I4d7709effb8cb98827e6bdd62e422186d61ed2a0
diff --git a/configure.ac b/configure.ac
index eb0dd9f..68723f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7546,8 +7546,8 @@ if test $enable_python = system; then
# 2.6.2 currently on OpenSUSE 12.1?
# rpm -q mingw32-python => mingw32-python-2.6.2-17.17.noarch
PYTHON_VERSION=$python_version.2
- PYTHON_VERSION_MAJOR=${python_version%.*}
- PYTHON_VERSION_MINOR=${python_version#*.}
+ PYTHON_VERSION_MAJOR=`echo $python_version | cut -d . -f 1`
+ PYTHON_VERSION_MINOR=`echo $python_version | cut -d . -f 2`
break
fi
done
commit 55563832c492e5b03a88763cf15384655ba31181
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 1 08:54:11 2013 +0100
check for python.exe too
Change-Id: I6f66348f8e40a7f977f33e145171489d7c57b8be
diff --git a/configure.ac b/configure.ac
index 643f232..eb0dd9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7532,7 +7532,12 @@ if test $enable_python = system; then
if test -f ${MINGW_SYSROOT}/include/python${python_version}/Python.h; then
PYTHON_CFLAGS="-I${MINGW_SYSROOT}/include/python$python_version"
PYTHON_LIBS="-L${MINGW_SYSROOT}lib -lpython$python_version $python_libs"
- MINGW_PYTHON_EXE=python.exe
+ AC_MSG_CHECKING([for python.exe])
+ AS_IF([test -f "$MINGW_SYSROOT/mingw/bin/python.exe"],
+ [AC_MSG_RESULT([$MINGW_SYSROOT/mingw/bin/python.exe])
+ MINGW_PYTHON_EXE=python.exe],
+ [AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([could not find python.exe])])
libo_MINGW_CHECK_DLL([PYTHON], [libpython$python_version])
libo_MINGW_CHECK_DLL([READLINE], [libreadline6])
libo_MINGW_CHECK_DLL([TERMCAP], [libtermcap])
commit 3f22967547f529e46651c9247d696dd7668943dc
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 1 08:47:36 2013 +0100
fail early if python version cannot be determined
Change-Id: I8fea82f8d4f779b0e7f8550fb67b794d6ae913ba
diff --git a/configure.ac b/configure.ac
index 8428abc..643f232 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7546,6 +7546,11 @@ if test $enable_python = system; then
break
fi
done
+ AC_MSG_CHECKING([for python version])
+ AS_IF([test -n "$PYTHON_VERSION"],
+ [AC_MSG_RESULT([$PYTHON_VERSION])],
+ [AC_MSG_RESULT([not found])
+ AC_MSG_ERROR([no usable python found])])
test -n "$PYTHON_CFLAGS" && break
fi
fi
commit 3638ffa2a3d8007c3e6dc83ba7ff712fc1609bb3
Author: David Tardon <dtardon at redhat.com>
Date: Tue Jan 1 08:30:10 2013 +0100
always set library path
Change-Id: Id8984f64615ac5d2ecfccca5d1d44ea5db76811c
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index c85b612..9e348e7 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -48,7 +48,7 @@
# SrsPartMergeTarget class
gb_SrsPartMergeTarget_TRANSEXDEPS := $(call gb_Executable_get_runtime_dependencies,transex3)
-gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,transex3)
+gb_SrsPartMergeTarget_TRANSEXCOMMAND := $(call gb_Executable_get_command,transex3)
define gb_SrsPartMergeTarget__command
$(call gb_Output_announce,$(3),$(true),srs,1)
@@ -87,7 +87,7 @@ endef
# gb_SrsPartTarget__command_dep
gb_ResTarget_RSCDEPS := $(call gb_Executable_get_runtime_dependencies,rsc)
-gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,rsc)
+gb_ResTarget_RSCCOMMAND := SOLARBINDIR=$(OUTDIR_FOR_BUILD)/bin $(call gb_Executable_get_command,rsc)
define gb_SrsPartTarget__command
$(call gb_Helper_abbreviate_dirs,\
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index b587fa9..15bf965 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -206,7 +206,7 @@ $(foreach def,$(1),$(if $(filter TRUE YES,$($(def))),-D$(def)))
endef
define gb_Helper_execute
-$(gb_Helper_set_ld_path) $(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
+$(call gb_Executable_get_command,$(firstword $(1))) $(wordlist 2,$(words $(1)),$(1))
endef
# gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk
index 4584e19..fca80c1 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -156,7 +156,7 @@ endef
# gb_ScpConvertTarget_ScpConvertTarget_platform
gb_ScpConvertTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,ulfconv)
-gb_ScpConvertTarget_COMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,ulfconv)
+gb_ScpConvertTarget_COMMAND := $(call gb_Executable_get_command,ulfconv)
define gb_ScpConvertTarget__command
$(call gb_Output_announce,$(2),$(true),SCC,1)
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index 0ccfc56..6ecc79d 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -32,7 +32,7 @@
# SdiTarget class
gb_SdiTarget_SVIDLDEPS := $(call gb_Executable_get_runtime_dependencies,svidl)
-gb_SdiTarget_SVIDLCOMMAND := $(gb_Helper_set_ld_path) $(call gb_Executable_get_command,svidl)
+gb_SdiTarget_SVIDLCOMMAND := $(call gb_Executable_get_command,svidl)
$(call gb_SdiTarget_get_target,%) : $(SRCDIR)/%.sdi $(gb_SdiTarget_SVIDLDEPS)
$(call gb_Output_announce,$*,$(true),SDI,1)
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 428af86..d24818e 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -358,19 +358,13 @@ $(call gb_Executable_get_runtime_target,$(1))
endef
endif
-define gb_Executable__get_command
-$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
-$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
-$(call gb_Executable_get_target_for_build,$(1))
-endef
-
# Get complete command-line for running the executable
#
-# This includes setting library path, if necessary.
+# This includes setting library path.
#
# gb_Executable_get_command executable
define gb_Executable_get_command
-$(strip $(call gb_Executable__get_command,$(1)))
+$(gb_Helper_set_ld_path) $(call gb_Executable_get_target_for_build,$(1))
endef
gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
More information about the Libreoffice-commits
mailing list