config_host/config_python.h.in | 8 ++++++++
configure.ac | 4 +++-
pyuno/CustomTarget_python_shell.mk | 3 ++-
pyuno/CustomTarget_pyuno_pythonloader_ini.mk | 1 +
pyuno/Executable_python.mk | 4 ----
pyuno/zipcore/python.cxx | 12 +++++++-----
6 files changed, 21 insertions(+), 11 deletions(-)
New commits:
commit aa93151b9a740582732a06578e04b558beb177c2
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 17 23:52:10 2015 +0200
configure, pyuno: stop claiming our python 3.3.5 is 3.3.3
... and adapt makefiles to automatically rebuild everything that depends
on PYTHON_VERSION.
Change-Id: If468183e59463503051c2a1526a905dbee9bf4cb
Reviewed-on: https://gerrit.libreoffice.org/17818
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/config_host/config_python.h.in b/config_host/config_python.h.in
new file mode 100644
index 0000000..3258205
--- /dev/null
+++ b/config_host/config_python.h.in
@@ -0,0 +1,8 @@
+/* python stuff */
+
+#ifndef CONFIG_PYTHON_H
+#define CONFIG_PYTHON_H
+
+#undef PYTHON_VERSION_STRING
+
+#endif // CONFIG_PYTHON_H
diff --git a/configure.ac b/configure.ac
index c2f7dc6..5944d23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8106,7 +8106,8 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=3
- PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.3
+ PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.5
+ AC_DEFINE_UNQUOTED([PYTHON_VERSION_STRING], [L"${PYTHON_VERSION}"])
BUILD_TYPE="$BUILD_TYPE PYTHON"
# Embedded Python dies without Home set
if test "$HOME" = ""; then
@@ -13168,6 +13169,7 @@ AC_CONFIG_HEADERS([config_host/config_vclplug.h])
AC_CONFIG_HEADERS([config_host/config_version.h])
AC_CONFIG_HEADERS([config_host/config_oauth2.h])
AC_CONFIG_HEADERS([config_host/config_poppler.h])
+AC_CONFIG_HEADERS([config_host/config_python.h])
AC_OUTPUT
if test "$CROSS_COMPILING" = TRUE; then
diff --git a/pyuno/CustomTarget_python_shell.mk
b/pyuno/CustomTarget_python_shell.mk
index bc6d355..203258b 100644
--- a/pyuno/CustomTarget_python_shell.mk
+++ b/pyuno/CustomTarget_python_shell.mk
@@ -27,7 +27,8 @@ $(call
gb_CustomTarget_get_workdir,pyuno/python_shell)/python.sh : \
cat $^ > $@ && chmod +x $@
$(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \
- $(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh
+ $(SRCDIR)/pyuno/zipcore/$(if $(filter
MACOSX,$(OS)),mac,nonmac).sh \
+ $(BUILDDIR)/config_$(gb_Side)/config_python.h
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \
$< > $@
diff --git a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
index 920a7a3..51cb35f 100644
--- a/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
+++ b/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
@@ -14,6 +14,7 @@ $(eval $(call
gb_CustomTarget_register_targets,pyuno/pythonloader_ini, \
))
$(call gb_CustomTarget_get_workdir,pyuno/pythonloader_ini)/$(call
gb_Helper_get_rcfile,pythonloader.uno): \
+ $(BUILDDIR)/config_$(gb_Side)/config_python.h \
$(SRCDIR)/pyuno/CustomTarget_pyuno_pythonloader_ini.mk
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( printf '[Bootstrap]\n' && \
diff --git a/pyuno/Executable_python.mk b/pyuno/Executable_python.mk
index 2f96404..05220bc2 100644
--- a/pyuno/Executable_python.mk
+++ b/pyuno/Executable_python.mk
@@ -9,10 +9,6 @@
$(eval $(call gb_Executable_Executable,python))
-$(eval $(call gb_Executable_add_defs,python,\
- -DMY_PYVERSION=L\"$(PYTHON_VERSION)\" \
-))
-
$(eval $(call gb_Executable_use_static_libraries,python,\
ooopathutils \
))
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 6944d93..239f315 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_python.h>
+
#include <cstddef>
#include <stdlib.h>
#include <wchar.h>
@@ -98,14 +100,14 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t pythonpath2[MAX_PATH];
wchar_t * pythonpath2End = tools::buildPath(
pythonpath2, path, pathEnd,
- MY_STRING(L"\\python-core-" MY_PYVERSION L"\\lib"));
+ MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING L"\\lib"));
if (pythonpath2End == NULL) {
exit(EXIT_FAILURE);
}
wchar_t pythonpath3[MAX_PATH];
wchar_t * pythonpath3End = tools::buildPath(
pythonpath3, path, pathEnd,
- MY_STRING(L"\\python-core-" MY_PYVERSION L"\\lib\\site-packages"));
+ MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING
L"\\lib\\site-packages"));
if (pythonpath3End == NULL) {
exit(EXIT_FAILURE);
}
@@ -113,21 +115,21 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t pythonpath4[MAX_PATH];
wchar_t * pythonpath4End = tools::buildPath(
pythonpath4, path, pathEnd,
- MY_STRING(L"\\python-core-" MY_PYVERSION L"\\lib\\lib-dynload"));
+ MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING
L"\\lib\\lib-dynload"));
if (pythonpath4End == NULL) {
exit(EXIT_FAILURE);
}
#endif
wchar_t pythonhome[MAX_PATH];
wchar_t * pythonhomeEnd = tools::buildPath(
- pythonhome, path, pathEnd, MY_STRING(L"\\python-core-" MY_PYVERSION));
+ pythonhome, path, pathEnd, MY_STRING(L"\\python-core-"
PYTHON_VERSION_STRING));
if (pythonhomeEnd == NULL) {
exit(EXIT_FAILURE);
}
wchar_t pythonexe[MAX_PATH];
wchar_t * pythonexeEnd = tools::buildPath(
pythonexe, path, pathEnd,
- MY_STRING(L"\\python-core-" MY_PYVERSION L"\\bin\\python.exe"));
+ MY_STRING(L"\\python-core-" PYTHON_VERSION_STRING
L"\\bin\\python.exe"));
if (pythonexeEnd == NULL) {
exit(EXIT_FAILURE);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
