update build scripts

ScriptSmith · ScriptSmith · commit 694cad82e2eb · 2018-05-15T21:26:30.000+10:00
diff --git a/scripts/mac.sh b/scripts/mac.sh
@@ -5,6 +5,7 @@ pip3 install git+https://github.com/ScriptSmith/socialreaper.git
 rm -r dist/
 pyinstaller reaper.spec
 cd dist/
+security unlock-keychain
 codesign -s "Developer ID Application: Adam Smith" --deep reaper.app
 pkgbuild --install-location /Applications --component reaper.app --identifier Reaper --version $1 --sign "Developer ID Installer: Adam Smith" Reaper.pkg
 zip -r reaper.zip reaper.app
diff --git a/scripts/setup.iss b/scripts/setup.iss
@@ -2,7 +2,6 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Reaper"
-#define MyAppVersion "2.5.3"
 #define MyAppPublisher "The University of Queensland"
 #define MyAppURL "http://reaper.social"
 #define MyAppExeName "reaper.exe"
@@ -13,15 +12,16 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{D200F93A-07DC-4F73-8713-18E4CDCAA43C}
 AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
+AppVersion={#ApplicationVersion}
+;AppVerName={#MyAppName} {#ApplicationVersion}
 AppPublisher={#MyAppPublisher}
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
 DefaultDirName={pf}\{#MyAppName}
 DisableProgramGroupPage=yes
 LicenseFile=C:\Users\s4394487\src\reaper\dist\reaper\LICENSE.txt
+OutputDir=C:\Users\s4394487\src\reaper\dist\
 OutputBaseFilename=reaper-setup
 SetupIconFile=C:\Users\s4394487\src\reaper\dist\reaper\ui\icon.ico
 Compression=lzma
diff --git a/scripts/windows.bat b/scripts/windows.bat
@@ -1,3 +1,4 @@
+pip install -e ..\socialreaper
 rmdir build\ /s /q
 rmdir dist\reaper /s /q
 pyinstaller.exe -w -i ui/icon.ico reaper.py
@@ -6,4 +7,4 @@ robocopy sources dist\reaper\sources /mir
 robocopy licenses dist\reaper\licenses /mir
 copy LICENSE.txt dist\reaper\LICENSE.txt
 copy sources.xml dist\reaper\sources.xml
-scripts\setup.iss
+"C:\Program Files (x86)\Inno Setup 5\ISCC.exe" scripts\setup.iss /DApplicationVersion==%1
