more travis cleanup

src/gam.wxs

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

src/travis/linux-install.sh

@@ -13,7 +13,7 @@ else
   this_glibc_ver=$(ldd --version | awk '/ldd/{print $NF}')
   GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-glibc$this_glibc_ver.tar.xz
   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:"
   du -h $gam
   time $gam version extended

src/travis/osx-install.sh

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

src/travis/windows-install.sh

@@ -14,8 +14,6 @@ cp gam-setup.bat $gampath
 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 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/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