Merge branch 'master' of github.com:andre-meyer/sm64-randomizer

Author: andre-meyer

3rdparty/n64chcksum_win_x86.exe 3rdparty/n64cksum_win_x86.exe3rdparty/n64chcksum_win_x86.exe renamed to 3rdparty/n64cksum_win_x86.exe

@@ -5,7 +5,7 @@ block_cipher = None
 
 a = Analysis(['main.py'],
              pathex=['C:\\Users\\Administrator\\Desktop\\sm64-randomizer'],
-             binaries=[],
+             binaries=[('Lib/site-packages/rtree/spatialindex*', '.')],
              datas=[('README.md', '.'), ('LICENSE', '.'), ('Data', '.'), ('Lib/site-packages/trimesh/resources', 'trimesh/resources/')],
              hiddenimports=[],
              hookspath=[],

main-win.spec

@@ -3,18 +3,11 @@
 # Install Python 3.7.x (newest minor) both 32 and 64 bit. If you only require one and not the other, feel free to remove/comment out the other.
 # Make sure Python is installed in the default folder in your Users Directory
 
-# setup (read version file, create folders)
-#./Scripts/activate.ps1
-$env:Path = ";$home\AppData\Local\Programs\Python\Python37-32"
-$env:Path += ";$home\AppData\Local\Programs\Python\Python37-32\Scripts"
-
 $RandoVersion = python -c 'from __version__ import __version__; print(__version__)'
 echo "Randomizer Version: $RandoVersion"
 
 mkdir ./release -ErrorAction SilentlyContinue
 
-$env:Path = ";$home\AppData\Local\Programs\Python\Python37-32"
-$env:Path += ";$home\AppData\Local\Programs\Python\Python37-32\Scripts"
 # 32 bit
 pip install -r .\requirements.txt
 Remove-Item ./dist/ -Recurse -ErrorAction SilentlyContinue
@@ -23,47 +16,15 @@ pyinstaller main-win.spec
 mv "dist/main.exe" "dist/SM64 Randomizer Generator.exe"
 
 mkdir ./dist/3rdparty -ErrorAction SilentlyContinue
-mkdir ./dist/Data -ErrorAction SilentlyContinue
-mkdir ./dist/Config -ErrorAction SilentlyContinue
 
-cp 3rdparty/*win* ./dist/3rdparty
-cp 3rdparty/LICENSE ./dist/3rdparty
-cp 3rdparty/README.md ./dist/3rdparty
-cp LICENSE ./dist/LICENSE
-cp README.md ./dist/README.md
-cp Config/* ./dist/Config/
-cp Data/* ./dist/Data/
+Copy-Item 3rdparty/*.exe -Destination dist/3rdparty
+Copy-Item 3rdparty/LICENSE -Destination dist/3rdparty
+Copy-Item 3rdparty/README.md -Destination dist/3rdparty
+Copy-Item ./Config -Destination ./dist -Recurse -Force
+Copy-Item ./Data -Destination ./dist -Recurse -Force
 
 $ArchiveName = "release/sm64-randomizer-$RandoVersion-win32.zip"
 del $ArchiveName -ErrorAction SilentlyContinue
 cd dist
 & 'C:\Program Files\7-Zip\7z.exe' -tzip a ../$ArchiveName ./*.exe 3rdparty/* *.md LICENSE ./Data ./Config
 cd ..
-
-# 64 bit
-$env:Path = ";$home\AppData\Local\Programs\Python\Python37"
-$env:Path += ";$home\AppData\Local\Programs\Python\Python37\Scripts"
-
-pip install -r .\requirements.txt
-Remove-Item ./dist/ -Recurse
-Remove-Item ./release/*.exe
-pyinstaller main-win.spec
-mv "dist/main.exe" "dist/SM64 Randomizer Generator.exe"
-
-mkdir ./dist/3rdparty -ErrorAction SilentlyContinue
-mkdir ./dist/Data -ErrorAction SilentlyContinue
-mkdir ./dist/Config -ErrorAction SilentlyContinue
-
-cp 3rdparty/*win* ./dist/3rdparty
-cp 3rdparty/LICENSE ./dist/3rdparty
-cp 3rdparty/README.md ./dist/3rdparty
-cp LICENSE ./dist/LICENSE
-cp README.md ./dist/README.md
-cp Config/* ./dist/Config/
-cp Data/* ./dist/Data/
-
-$ArchiveName = "release/sm64-randomizer-$RandoVersion-win64.zip"
-del $ArchiveName -ErrorAction SilentlyContinue
-cd dist
-& 'C:\Program Files\7-Zip\7z.exe' -tzip a ../$ArchiveName ./*.exe 3rdparty/* *.md LICENSE ./Data ./Config
-cd ..