Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -45,11 +45,13 @@ rpm: $(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.rpm" st2.py tar: $(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.bin.txz" st2.py exe: - $(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.exe" st2.py help/help.chm + $(PACK) -t $@ $(OPTS) $(DEPS) -p "$(NAME)-VERSION.exe" \ + --exe-exec 'cmd /K c:\usr\share\streamtuner2\dev\install_python_gtk.bat' \ + --exe-dest c:/ --version $(VERSION) help/help.chm dev/install_python_gtk.bat st2.py arch: $(PACK) -t $@ $(OPTS) $(DEPS_A) -p "$(NAME)-VERSION.arch.txz" st2.py pyz: #@BUG: relative package references leave a /tmp/doc/ folder $(PACK) -u packfile -s src -t zip --zip-shebang "/usr/bin/env python" \ ADDED dev/install_python_gtk.bat Index: dev/install_python_gtk.bat ================================================================== --- dev/install_python_gtk.bat +++ dev/install_python_gtk.bat @@ -0,0 +1,3 @@ +# pack: install_python_gtk.ps1 + +PowerShell -File c:\usr\share\streamtuner2\dev\install_python_gtk.ps1 -ExecutionPolicy ByPass ADDED dev/install_python_gtk.ps1 Index: dev/install_python_gtk.ps1 ================================================================== --- dev/install_python_gtk.ps1 +++ dev/install_python_gtk.ps1 @@ -0,0 +1,68 @@ +# + +# Run as post-install script for .exe package + +$TEMP = $env:TEMP +$PYTHON = "C:\\Python27" + +#-- what +$files = @( + "https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi", + "http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.24/pygtk-all-in-one-2.24.2.win32-py2.7.msi", + "$PYTHON\\Tools\\easy_install.exe requests", + "https://pypi.python.org/packages/3d/ee/affbc53073a951541b82a0ba2a70de266580c00f94dd768a60f125b04fca/lxml-2.3.win32-py2.7.exe", + "https://pypi.python.org/packages/62/71/8ac1f5c0251e51714d20e4b102710d5eee1683c916616129552b0a025ba5/pyquery-1.2.17-py2.py3-none-any.whl#noexec", + "$PYTHON\\Tools\\pip install $TEMP\\pyquery-1.2.17-py2.py3-none-any.whl", + "http://effbot.org/downloads/PIL-1.1.7.win32-py2.7.exe" +) + +#-- ask before running +Write-Host "Do you want to install Python 2.7 and Gtk dependencies now?" +Write-Host "" +Write-Host " - Leave the default install path of $PYTHON for this to work." +Write-Host " - This will install 32-bit versions of Python and Gtk." +Write-Host "" +#$y = Read-Host "y/n" +#if ($y -notmatch "y|Y|1") { +# exit; +#} +Write-Host "" + +#-- process +ForEach ($url in $files) { + + echo "`n[[[ $url ]]]" #` + chdir($TEMP); + + if ($url -match "https?://.+") { + $file = [regex]::match($url, "/([^/]+)($|[?#])").Groups[1].Value; + + # download + $wget = New-Object System.Net.WebClient + $wget.DownloadFile($url, "$TEMP\\$file"); + + # run + if ($url -match ".+#noexec") { + } + elseif ($url -match ".+.msi$") { + Start-Process -Wait msiexec -ArgumentList /i,"$TEMP\\$file" + } + elseif ($url -match ".+.exe$") { + Start-Process -Wait "$TEMP\\$file" + } + else { + & "$TEMP\\$file" + } + } + else { + # only run command + chdir($PYTHON) + & "$url" + } +} + +#-- make ST2 .lnk +$WshShell = New-Object -comObject WScript.Shell +$Shortcut = $WshShell.CreateShortcut("$Home\Desktop\Streamtuner2.lnk") +$Shortcut.TargetPath = "C:\Python27\pythonw.exe c:\usr\bin\streamtuner2" +$Shortcut.Save()