Unverified Commit d84b012e authored by boklm's avatar boklm
Browse files

packages: add python to the Windows bundle

parent e59d5e98
......@@ -12,10 +12,23 @@ tar xf $rootdir/[% c("input_files_by_name/ImageMagick") %]
[% END %]
[% IF c("var/cygwin") %]
mv $rootdir/[% c("input_files_by_name/python_msi") %] .
mkdir tmp
unzip -d ./tmp $rootdir/[% c("input_files_by_name/cygwin-setup") %]
mv tmp/cygwin-setup/* .
rmdir tmp/cygwin-setup tmp
cat > "python-setup.bat" << EOF
SET ROOTDIR=%~dp0
CD %ROOTDIR%
IF NOT EXIST %ROOTDIR%\\python\\* msiexec /a python-[% c("var/python_version") %].msi /qb TARGETDIR=%ROOTDIR%\\python
EOF
cat > "bundle-setup.bat" << EOF
CALL python-setup.bat
CALL cygwin-setup.bat
EOF
[% END %]
cat > set-env << 'EOF'
......
......@@ -13,6 +13,7 @@ targets:
var:
build_imagemagick: 0
filename_ext: zip
python_version: 2.7.12
input_files:
- project: tbb-testsuite-deps
......@@ -23,3 +24,9 @@ input_files:
- project: cygwin-setup
name: cygwin-setup
enable: '[% c("var/cygwin") %]'
- URL: 'https://www.python.org/ftp/python/[% c("var/python_version") %]/python-[% c("var/python_version") %].msi'
name: python_msi
file_gpg_id: 1
sig_ext: asc
gpg_keyring: python.gpg
enable: '[% c("var/cygwin") %]'
@ECHO OFF
SET TESTSUITEDIR=%~dp0
CD %TESTSUITEDIR%\bundle
CALL cygwin-setup.bat
CALL bundle-setup.bat
CD ..
bundle\cygwin\bin\bash --login -i -c 'cd $(cygpath -u "$TESTSUITEDIR"); exec /bin/bash'
@ECHO OFF
SET TESTSUITEDIR=%~dp0
CD %TESTSUITEDIR%\bundle
CALL cygwin-setup.bat
CALL bundle-setup.bat
CD ..
bundle\cygwin\bin\bash --login -i -c 'cd $(cygpath -u "$TESTSUITEDIR"); exec ./update-tbb-testsuite'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment