Merge branch 'master' of github.com:micahflee/onionshare

This commit is contained in:
Micah Lee 2015-05-19 13:34:48 -07:00
commit 4be8d68750
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@ REM use pyinstaller to builder a folder with onionshare.exe
pyinstaller -y install\onionshare-win.spec pyinstaller -y install\onionshare-win.spec
REM sign onionshare.exe REM sign onionshare.exe
signtool.exe sign /v /d "OnionShare" /a /tr "http://www.startssl.com/timestamp" dist\onionshare\onionshare.exe signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll dist\onionshare\onionshare.exe
REM run onionshare once, to compile the .py files into .pyc REM run onionshare once, to compile the .py files into .pyc
dist\onionshare\onionshare.exe --help dist\onionshare\onionshare.exe --help
@ -11,4 +11,4 @@ REM build an installer, dist\OnionShare_Setup.exe
makensisw install\onionshare.nsi makensisw install\onionshare.nsi
REM sign OnionShare_Setup.exe REM sign OnionShare_Setup.exe
signtool.exe sign /v /d "OnionShare" /a /tr "http://www.startssl.com/timestamp" dist\OnionShare_Setup.exe signtool.exe sign /v /d "OnionShare" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll dist\OnionShare_Setup.exe

View File

@ -6,7 +6,7 @@
!define INSTALLSIZE 31187 !define INSTALLSIZE 31187
!define VERSIONMAJOR 0 !define VERSIONMAJOR 0
!define VERSIONMINOR 7 !define VERSIONMINOR 7
!define VERSIONSTRING "0.7dev" !define VERSIONSTRING "0.7"
RequestExecutionLevel admin RequestExecutionLevel admin
@ -41,7 +41,7 @@ ${EndIf}
!echo "Creating normal installer" !echo "Creating normal installer"
!system "$\"${NSISDIR}\makensis$\" /DINNER onionshare.nsi" = 0 !system "$\"${NSISDIR}\makensis$\" /DINNER onionshare.nsi" = 0
!system "$%TEMP%\tempinstaller.exe" = 2 !system "$%TEMP%\tempinstaller.exe" = 2
!system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://www.startssl.com/timestamp $%TEMP%\uninstall.exe" = 0 !system "signtool.exe sign /v /d $\"Uninstall OnionShare$\" /a /tr http://timestamp.globalsign.com/scripts/timstamp.dll $%TEMP%\uninstall.exe" = 0
# all done, now we can build the real installer # all done, now we can build the real installer
OutFile "..\dist\OnionShare_Setup.exe" OutFile "..\dist\OnionShare_Setup.exe"