deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-06-29 18:31:38 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

more travis cleanup

Browse Source
This commit is contained in:
Jay Lee
2020-04-23 15:28:57 -04:00
parent ce9fe17994
commit 62fa5fef79
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gam.wxs
View File

@@ -41,7 +41,7 @@
<ComponentGroup <ComponentGroup
Id="ProductComponents" Id="ProductComponents"
Directory="INSTALLFOLDER" Directory="INSTALLFOLDER"
Source="gam-64"> Source="dist">
<Component Id="gam_exe" Guid="886abc07-73c5-4acc-9f71-58daf62aabc1"> <Component Id="gam_exe" Guid="886abc07-73c5-4acc-9f71-58daf62aabc1">
<File Name="gam.exe" KeyPath="yes" /> <File Name="gam.exe" KeyPath="yes" />
<Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="yes" Part="last" Action="set" System="yes" /> <Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="yes" Part="last" Action="set" System="yes" />

2
src/travis/linux-install.sh
View File

@@ -13,7 +13,7 @@ else
this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}') this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}')
GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-glibc$this_glibc_ver.tar.xz GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-glibc$this_glibc_ver.tar.xz
rm $gampath/lastupdatecheck.txt rm $gampath/lastupdatecheck.txt
tar cfJ --transform s/dist/gam/ $GAM_ARCHIVE $gampath tar cfJ $GAM_ARCHIVE $gampath --transform s/.*dist/gam/
echo "PyInstaller GAM info:" echo "PyInstaller GAM info:"
du -h $gam du -h $gam
time $gam version extended time $gam version extended

2
src/travis/osx-install.sh
View File

@@ -12,4 +12,4 @@ cp GamCommands.txt $gampath
MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString) MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString)
GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-MacOS$MACOSVERSION.tar.xz GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-MacOS$MACOSVERSION.tar.xz
rm $gampath/lastupdatecheck.txt rm $gampath/lastupdatecheck.txt
gtar cfJ $GAM_ARCHIVE --transform s/$gampath/gam $gampath gtar cfJ $GAM_ARCHIVE $gampath --transform s/.*dist/gam/

2
src/travis/windows-install.sh
View File

@@ -14,8 +14,6 @@ cp gam-setup.bat $gampath
GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM.zip
/c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE $gampath -xr!.svn /c/Program\ Files/7-Zip/7z.exe a -tzip $GAM_ARCHIVE $gampath -xr!.svn
/c/Program\ Files/7-Zip/7z.exe rn $GAM_ARCHIVE dist\ gam\ /c/Program\ Files/7-Zip/7z.exe rn $GAM_ARCHIVE dist\ gam\
mkdir gam-64
cp -rf $gampath/* gam-64/
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs
/c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true; /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/light.exe -ext /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/WixUIExtension.dll gam.wixobj -o gam-$GAMVERSION-$GAMOS-$PLATFORM.msi || true;
rm *.wixpdb rm *.wixpdb