diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-08-17 23:52:10 +0200 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-08-18 11:19:43 +0000 |
commit | aa93151b9a740582732a06578e04b558beb177c2 (patch) | |
tree | 2226d18076c5cb120423179e6265821852e9a069 /pyuno | |
parent | coverity#1316521 Dereference null return value (diff) | |
download | core-aa93151b9a740582732a06578e04b558beb177c2.tar.gz core-aa93151b9a740582732a06578e04b558beb177c2.zip |
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 <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'pyuno')
-rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 3 | ||||
-rw-r--r-- | pyuno/CustomTarget_pyuno_pythonloader_ini.mk | 1 | ||||
-rw-r--r-- | pyuno/Executable_python.mk | 4 | ||||
-rw-r--r-- | pyuno/zipcore/python.cxx | 12 |
4 files changed, 10 insertions, 10 deletions
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index bc6d355f7907..203258bf94e3 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 920a7a38bf35..51cb35f3d981 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 2f96404b7ae2..05220bc24e1d 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 6944d932c666..239f31546533 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); } |