3 files changed, 97 insertions, 20 deletions

diff --git a/recipes/python/nativesdk-prebuild-python.bb b/recipes/python/nativesdk-prebuild-python.inc
index e8edb9e..3d8c083 100644
--- a/recipes/python/nativesdk-prebuild-python.bb
+++ b/recipes/python/nativesdk-prebuild-python.inc
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -29,32 +29,25 @@
 
 LICENSE = "PSFv2"
 
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Python-2.0;md5=a5c8025e305fb49e6d405769358851f6"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4b8a9367e6bb2acb6f26dc08654f6ee5"
 
-inherit bin_package nativesdk
+do_unpack[depends] += "p7zip-native:do_populate_sysroot"
 
-COMPATIBLE_HOST = ".*-mingw.*"
+inherit bin_package nativesdk python3-dir
 
-SRC_URI[md5sum] = "6d37712f01fa836b1303141a6d4cabda"
-SRC_URI[sha256sum] = "3835868c171dddb8cb68ed5578b6d4d639387a038e999a5b008f393b704d6ad7"
-SRC_URI = "http://download.qt.io/development_releases/prebuilt/gdb/build-prerequisites/python.zip"
+PV = "3.5.2"
 
 S = "${WORKDIR}"
 
 do_install() {
-    install -d ${D}${bindir}
-    install ${WORKDIR}/python/python27.dll ${D}${bindir}
-    install -d ${D}${includedir}
-    install ${WORKDIR}/python/include/* ${D}${includedir}
+    install -d ${D}${includedir}/${PYTHON_DIR}
+    install -m 0644 ${S}/include/* ${D}${includedir}/${PYTHON_DIR}
+
     install -d ${D}${libdir}
-    install ${WORKDIR}/python/libs/* ${D}${libdir}
-    install -d ${D}${libdir}/python2.7
-    cp -r ${WORKDIR}/python/lib/* ${D}${libdir}/python2.7
-}
+    install -m 0644 ${S}/libs/*.a ${D}${libdir}
 
-sysroot_stage_dirs_append() {
-    sysroot_stage_dir $from${bindir} $to${bindir}
+    install -d ${D}${bindir}
+    install -m 0644 ${S}/python.exe ${D}${bindir}
+    install -m 0644 ${S}/python35.dll ${D}${bindir}
+    install -m 0644 ${S}/python35.zip ${D}${bindir}
 }
-
-# requires /usr/local/bin/python, but no providers found
-INSANE_SKIP_${PN} += "file-rdeps"
diff --git a/recipes/python/nativesdk-prebuild-python_i686.bb b/recipes/python/nativesdk-prebuild-python_i686.bb
new file mode 100644
index 0000000..2ff4f76
--- /dev/null
+++ b/recipes/python/nativesdk-prebuild-python_i686.bb
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require nativesdk-prebuild-python.inc
+
+COMPATIBLE_HOST = "i686.*-mingw.*"
+
+SRC_URI = "\
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x86.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-win32.zip;name=bin \
+    "
+
+SRC_URI[md5sum] = "3da266445a4e6a93ff1949810141da8f"
+SRC_URI[sha256sum] = "b60c49227c6e920904d784681c16ee3591a18824c3abb89613813f93fde1c1f2"
+SRC_URI[bin.md5sum] = "ad637a1db7cf91e344318d55c94ad3ca"
+SRC_URI[bin.sha256sum] = "75f05800fbe4a8cd6672b268ca53244838684561e03c60c668a7dccb050eb954"
diff --git a/recipes/python/nativesdk-prebuild-python_x86_64.bb b/recipes/python/nativesdk-prebuild-python_x86_64.bb
new file mode 100644
index 0000000..8e69fbd
--- /dev/null
+++ b/recipes/python/nativesdk-prebuild-python_x86_64.bb
@@ -0,0 +1,42 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is part of the Boot to Qt meta layer.
+##
+## $QT_BEGIN_LICENSE:GPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 or (at your option) any later version
+## approved by the KDE Free Qt Foundation. The licenses are as published by
+## the Free Software Foundation and appearing in the file LICENSE.GPL3
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+############################################################################
+
+require nativesdk-prebuild-python.inc
+
+COMPATIBLE_HOST = "x86_64.*-mingw.*"
+
+SRC_URI = "\
+    https://download.qt.io/development_releases/prebuilt/python/Python35-win-x64.7z \
+    https://www.python.org/ftp/python/${PV}/python-${PV}-embed-amd64.zip;name=bin \
+    "
+
+SRC_URI[md5sum] = "08766b13bcbdcf8217a98bfc291d549f"
+SRC_URI[sha256sum] = "43e38c8a05dcbc2effd1915dbe2dc2be6e701ebf3eb00d6e45197ee773978124"
+SRC_URI[bin.md5sum] = "f1c24bb78bd6dd792a73d5ebfbd3b20e"
+SRC_URI[bin.sha256sum] = "faefbd98f61c0d87c5683eeb526ae4d4a9ddc369bef27870cfe1c8939329d066"