deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2025-07-09 06:03:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

include gam-setup.bat in MSI and zip. Call it from MSI at end of install.

Browse Source
This commit is contained in:
Jay Lee
2016-11-03 13:29:26 -04:00
parent ff3a8644ec
commit aa1db89bd3
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gam-setup.bat
View File

@ -68,5 +68,6 @@
@goto saauth @goto saauth
:sadone :sadone
echo GAM installation and setup complete! @echo GAM installation and setup complete!
:alldone :alldone
@pause

11
src/gam.wxs
View File

@ -52,6 +52,12 @@
<Component Id="whatsnew_txt" Guid="6aa9863c-90d9-412f-9b73-fda82549a950"> <Component Id="whatsnew_txt" Guid="6aa9863c-90d9-412f-9b73-fda82549a950">
<File Name="whatsnew.txt" KeyPath="yes" /> <File Name="whatsnew.txt" KeyPath="yes" />
</Component> </Component>
<Component Id="gam_setup_bat" Guid="ef01f93a-4b50-488a-9c04-ec5e13e66218">
<File Name="gam-setup.bat" KeyPath="yes" />
</Component>
<Component Id="gamcommands_txt" Guid="58ff9c45-a7c9-4e22-8845-a9a92610c1f3">
<File Name="gamcommands.txt" KeyPath="yes" />
</Component>
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>
@ -59,7 +65,10 @@
<InstallUISequence> <InstallUISequence>
<ExecuteAction /> <ExecuteAction />
<Show Dialog="WelcomeDlg" Before="ProgressDlg" /> <Show Dialog="WelcomeDlg" Before="ProgressDlg" />
<!-- <Show Dialog="ProgressDlg" After="" /> -->
</InstallUISequence> </InstallUISequence>
<CustomAction Id="setup_gam" ExeCommand="[INSTALLFOLDER]gam-setup.bat" Directory="INSTALLFOLDER" Execute="commit" Impersonate="yes" Return="asyncWait"/>
<InstallExecuteSequence>
<Custom Action="setup_gam" After="InstallFiles" >NOT Installed</Custom>
</InstallExecuteSequence>
</Fragment> </Fragment>
</Wix> </Wix>

4
src/windows-build.bat
View File

@ -11,12 +11,16 @@ del /q /f gam.wixpdb
c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec c:\python27-32\scripts\pyinstaller --clean -F --distpath=gam windows-gam.spec
xcopy LICENSE gam\ xcopy LICENSE gam\
xcopy whatsnew.txt gam\ xcopy whatsnew.txt gam\
xcopy gam-setup.bat gam\
xcopy gamcommands.txt gam\
del gam\w9xpopen.exe del gam\w9xpopen.exe
"%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows.zip gam\ -xr!.svn
c:\python27-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec c:\python27-64\scripts\pyinstaller --clean -F --distpath=gam-64 windows-gam.spec
xcopy LICENSE gam-64\ xcopy LICENSE gam-64\
xcopy whatsnew.txt gam-64\ xcopy whatsnew.txt gam-64\
xcopy gam-setup.bat gam-64\
xcopy gamcommands.txt gam-64\
"%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows-x64.zip gam-64\ -xr!.svn "%ProgramFiles%\7-Zip\7z.exe" a -tzip gam-%1-windows-x64.zip gam-64\ -xr!.svn
set GAMVERSION=%1 set GAMVERSION=%1