From f92c4d18db77c82f035e1fddf9a3dbe59e325cdf Mon Sep 17 00:00:00 2001
From: Jay Lee <jay0lee@gmail.com>
Date: Thu, 23 Apr 2020 19:29:18 -0400
Subject: [PATCH] try another technique to package

---
 src/gam.wxs                   |  2 +-
 src/travis/linux-install.sh   | 13 ++++++++-----
 src/travis/osx-install.sh     |  8 +++++---
 src/travis/windows-install.sh |  8 +++++---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/gam.wxs b/src/gam.wxs
index 0875956e..991ecb95 100644
--- a/src/gam.wxs
+++ b/src/gam.wxs
@@ -41,7 +41,7 @@
     <ComponentGroup
         Id="ProductComponents"
         Directory="INSTALLFOLDER"
-        Source="dist">
+	Source="dist/gam">
       <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" />
diff --git a/src/travis/linux-install.sh b/src/travis/linux-install.sh
index 9aeceb9c..0979a181 100755
--- a/src/travis/linux-install.sh
+++ b/src/travis/linux-install.sh
@@ -3,8 +3,11 @@ if [[ "$TRAVIS_JOB_NAME" == *"Testing" ]]; then
   export gam="$python -m gam"
   export gampath=$(readlink -e .)
 else
-  $python -OO -m PyInstaller --clean --noupx --strip -F gam.spec
-  export gampath=$(readlink -e dist)
+  export gampath="dist/gam"
+  rm -rf $gampath
+  mkdir -p $gampath
+  export gampath=$(readlink -e $gampath)
+  $python -OO -m PyInstaller --clean --noupx --strip -F --distpath $gampath gam.spec
   export gam="${gampath}/gam"
   export GAMVERSION=`$gam version simple`
   cp LICENSE $gampath
@@ -13,11 +16,11 @@ 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 $GAM_ARCHIVE $gampath --transform s/.*dist/gam/
+  # tar will cd to dist and compres gam/
+  tar cfJ -C dist/ $GAM_ARCHIVE gam/
   echo "PyInstaller GAM info:"
   du -h $gam
   time $gam version extended
-
   if [ "${TRAVIS_DIST}" == "xenial" ] && [ "${PLATFORM}" == "x86_64" ]; then
     GAM_LEGACY_ARCHIVE=gam-${GAMVERSION}-${GAMOS}-${PLATFORM}-legacy.tar.xz
     $python -OO -m staticx -l /lib/x86_64-linux-gnu/libresolv.so.2 -l /lib/x86_64-linux-gnu/libnss_dns.so.2 $gam $gam-staticx
@@ -25,7 +28,7 @@ else
     rm $gampath/gam
     mv $gam-staticx $gam
     chmod 755 $gam
-    tar cvfJ --transform s/dist/gam/ $GAM_LEGACY_ARCHIVE $gampath
+    tar cvfJ -C dist/ $GAM_LEGACY_ARCHIVE gam/
     echo "Legacy StaticX GAM info:"
     du -h $gam
     time $gam version extended
diff --git a/src/travis/osx-install.sh b/src/travis/osx-install.sh
index e56de5e1..77b1155f 100755
--- a/src/travis/osx-install.sh
+++ b/src/travis/osx-install.sh
@@ -1,8 +1,9 @@
 cd src
 echo "MacOS Version Info According to Python:"
 python -c "import platform; print(platform.mac_ver())"
-$python -OO -m PyInstaller --clean --noupx --strip -F gam.spec
-export gampath=dist
+export gampath=dist/gam
+rm -rf $gampath
+$python -OO -m PyInstaller --clean --noupx --strip -F --distpath $gampath gam.spec
 export gam="$gampath/gam"
 $gam version extended
 export GAMVERSION=`$gam version simple`
@@ -12,4 +13,5 @@ cp GamCommands.txt $gampath
 MACOSVERSION=$(defaults read loginwindow SystemVersionStampAsString)
 GAM_ARCHIVE=gam-$GAMVERSION-$GAMOS-$PLATFORM-MacOS$MACOSVERSION.tar.xz
 rm $gampath/lastupdatecheck.txt
-tar cfJ $GAM_ARCHIVE $gampath --transform s/$gampath/gam/
+# tar will cd to dist/ and tar up gam/
+tar cfJ -C dist/ $GAM_ARCHIVE gam/
diff --git a/src/travis/windows-install.sh b/src/travis/windows-install.sh
index 263da9a0..83d09544 100755
--- a/src/travis/windows-install.sh
+++ b/src/travis/windows-install.sh
@@ -1,7 +1,10 @@
 cd src
 echo "compiling GAM with pyinstaller..."
-pyinstaller --clean --noupx -F gam.spec
-export gampath=$(readlink -e dist)
+export gampath="dist/gam"
+rm -rf $gampath
+mkdir -p $gampath
+export gampath=$(readlink -e $gampath)
+pyinstaller --clean --noupx -F --distpath $gampath gam.spec
 export gam="${gampath}/gam"
 echo "running compiled GAM..."
 $gam version
@@ -13,7 +16,6 @@ cp whatsnew.txt $gampath
 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\
 
 echo "Running WIX candle $WIX_BITS..."
 /c/Program\ Files\ \(x86\)/WiX\ Toolset\ v3.11/bin/candle.exe -arch $WIX_BITS gam.wxs