Merge branch 'alvin/T6503-python-win'
ced405faf980
Actions

Authored by alvinhochun on Jul 29 2017, 7:14 AM.

Description

Merge branch 'alvin/T6503-python-win'

This also merges branch 'alvin/T6521-deps-update-win' into 'master'.

This merge enables Python scripting on Windows and updates some of the
3rdparty dependencies on 'master'. You should do a complete clean
rebuild of everything on Windows with the latest mingw-w64 7.1 compiler
to enable it.

CCMAIL: kimageshop@kde.org
Maniphest Tasks: T6503, T6521

Details

Committed

alvinhochun

Jul 29 2017, 7:14 AM

Parents

R37:cc4b3077f4ab: Add simple sorting script and make eror messages in KoColorSet more useful.
R37:adc56613254d: Add to package_2.cmd to delete Python cache files

Branches

Unknown

Tags

Unknown

alvinhochun committed R37:ced405faf980: Merge branch 'alvin/T6503-python-win' (authored by alvinhochun).Jul 29 2017, 7:14 AM

Merged Changes

Commit	Author	Details	Committed
adc56613254d	alvinhochun	Add to package_2.cmd to delete Python cache files	Jul 25 2017
7851a188355b	alvinhochun	Add CMake check for Python version on Windows	Jul 25 2017
9eb964b2488f	alvinhochun	Update build instructions for Python on Windows	Jul 24 2017
2420bea334bd	alvinhochun	Merge branch 'alvin/T6521-deps-update-win' into alvin/T6503-python-win	Jul 24 2017
f8e6a7ffb9d1	alvinhochun	Merge branch 'master' into alvin/T6521-deps-update-win	Jul 24 2017
d9f8f53a1395	alvinhochun	Update Windows build steps to use mingw-w64 7.1	Jul 24 2017
674a1baf2f95	alvinhochun	Copy embedded Python in Windows packaging script	Jul 24 2017
b0d384a00de4	alvinhochun	Copy Python DLLs to bin/ (Windows 3rdparty dep)	Jul 24 2017
e4440eda2536	alvinhochun	Merge branch 'alvin/T6521-deps-update-win' into alvin/T6503-python-win	Jul 20 2017
384d37140ea5	alvinhochun	Merge branch 'master' into alvin/T6521-deps-update-win	Jul 20 2017
99a4c494facc	alvinhochun	Revert Python library init on Linux, add finalize call	Jul 20 2017
fdecd6b875e1	alvinhochun	Fix pykrita build on Linux	Jul 20 2017
6332f0dadace	alvinhochun	Use alt ways to set Python paths and check for embedded Python	Jul 20 2017
46fc6dc92587	alvinhochun	Rewrite Python initialize code to set paths properly	Jul 19 2017
d81740abfb33	alvinhochun	Merge branch 'alvin/T6521-deps-update-win' into alvin/T6503-python-win	Jul 19 2017
565560074a37	alvinhochun	Enable MinGW Windows hardening flags for 3rdparty deps	Jul 19 2017
207791f308b2	alvinhochun	Add option to build Qt with debug info	Jul 18 2017
5e90d0604067	alvinhochun	Update embedded Python to 3.6.2. on Windows	Jul 18 2017
3829b2029244	alvinhochun	Merge branch 'master' into alvin/T6521-deps-update-win	Jul 18 2017
12698e950370	alvinhochun	Fix compile errors related to _hypot define	Jul 17 2017
49ce6bd816ad	alvinhochun	Make FindPyQt5 and FindSIP find their files	Jul 17 2017
589dc86b9542	alvinhochun	Update Qt to 5.9.1 for Windows	Jul 17 2017
17657f5ab476	alvinhochun	Update PyQt to 5.9 for Windows	Jul 17 2017
593affd0873c	alvinhochun	Update SIP to 4.19.3 for Windows	Jul 17 2017
1cc494b7ddc4	alvinhochun	Update Vc to 1.3.2	Jul 17 2017
77df8eaf5e12	alvinhochun	Fix kcoreaddons compile error on mingw-w64 7.1	Jul 17 2017

Changes (26)

				Path	Packages
	M			3rdparty/CMakeLists.txt
	M			3rdparty/README.md
	M			3rdparty/ext_boost/CMakeLists.txt
	M			3rdparty/ext_frameworks/CMakeLists.txt
	A			3rdparty/ext_frameworks/kcoreaddons-compile-fix.diff
	M			3rdparty/ext_pyqt/CMakeLists.txt
	A			3rdparty/ext_pyqt/pyqt-configure-fix.patch
	M			3rdparty/ext_python/CMakeLists.txt
	M			3rdparty/ext_qt/CMakeLists.txt
	M			3rdparty/ext_qt/disable-wintab.diff
	M			3rdparty/ext_sip/CMakeLists.txt
	M			3rdparty/ext_vc/CMakeLists.txt
	D			3rdparty/ext_vc/vc1.2_malloc_free.patch
	M			CMakeLists.txt
	A			PythonWindowsCheck.cmake
	M			cmake/modules/FindPyQt5.cmake
	M			cmake/modules/FindSIP.cmake
	M			cmake/modules/SIPMacros.cmake
	M			packaging/windows/package_2.cmd
	M			plugins/extensions/pykrita/CMakeLists.txt
	M			plugins/extensions/pykrita/kritarunner/CMakeLists.txt
	M			plugins/extensions/pykrita/plugin/CMakeLists.txt
	M			plugins/extensions/pykrita/plugin/engine.cpp
	M			plugins/extensions/pykrita/plugin/plugin.cpp
	M			plugins/extensions/pykrita/plugin/utilities.cpp
	M			plugins/extensions/pykrita/plugin/utilities.h