From c4ba28164569cec01d64cbe2ffe757b01763151a Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Tue, 11 Feb 2020 15:07:21 +0100
Subject: [PATCH] prep for 1.4 compiled release

---
 .gitignore                     |  1 +
 bundle/EntranceRandomizer.spec | 39 -------------------------
 bundle/_rt_hook.py             |  4 ---
 bundle/components.xslt         | 35 -----------------------
 bundle/installer.wxs           | 52 ----------------------------------
 setup.py                       |  2 +-
 6 files changed, 2 insertions(+), 131 deletions(-)
 delete mode 100644 bundle/EntranceRandomizer.spec
 delete mode 100644 bundle/_rt_hook.py
 delete mode 100644 bundle/components.xslt
 delete mode 100644 bundle/installer.wxs

diff --git a/.gitignore b/.gitignore
index 0deaca1a..70c2dbd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ RaceRom.py
 weights/
 /MultiMystery/
 /Players/
+/QUsb2Snes/
diff --git a/bundle/EntranceRandomizer.spec b/bundle/EntranceRandomizer.spec
deleted file mode 100644
index 308a3ba9..00000000
--- a/bundle/EntranceRandomizer.spec
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- mode: python -*-
-from PyInstaller.compat import is_win
-block_cipher = None
-
-# Todo: the runtime hooks should only be installed on windows
-a = Analysis(['../EntranceRandomizer.py'],
-             pathex=['bundle'],
-             binaries=[],
-             datas=[('../data/', 'data/'), ('../README.html', '.')],
-             hiddenimports=[],
-             hookspath=[],
-             runtime_hooks=['bundle/_rt_hook.py'],
-             excludes=['lzma', 'bz2'],
-             win_no_prefer_redirects=False,
-             win_private_assemblies=False,
-             cipher=block_cipher)
-pyz = PYZ(a.pure, a.zipped_data,
-             cipher=block_cipher)
-
-exe = EXE(pyz,
-          a.scripts,
-          exclude_binaries=True,
-          name='EntranceRandomizer',
-          debug=False,
-          strip=False,
-          upx=False,
-          icon='../data/ER.ico',
-          console=is_win )
-coll = COLLECT(exe,
-               a.binaries,
-               a.zipfiles,
-               a.datas,
-               strip=False,
-               upx=False,
-               name='EntranceRandomizer')
-app = BUNDLE(coll,
-             name ='EntranceRandomizer.app',
-             icon = '../data/ER.icns',
-             bundle_identifier = None)
diff --git a/bundle/_rt_hook.py b/bundle/_rt_hook.py
deleted file mode 100644
index 17ea446b..00000000
--- a/bundle/_rt_hook.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import sys
-import os
-
-sys.path.append(os.path.join(sys._MEIPASS, "ext"))
diff --git a/bundle/components.xslt b/bundle/components.xslt
deleted file mode 100644
index 1b4c7132..00000000
--- a/bundle/components.xslt
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0"
-            xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-            xmlns:msxsl="urn:schemas-microsoft-com:xslt"
-            exclude-result-prefixes="msxsl"
-            xmlns:wix="http://schemas.microsoft.com/wix/2006/wi">
-
-  <xsl:output method="xml" indent="no"/>
-
-  <xsl:strip-space elements="*"/>
-
-  <xsl:template match="@*|node()">
-    <xsl:copy>
-      <xsl:apply-templates select="@*|node()"/>
-    </xsl:copy>
-  </xsl:template>
-
-  <xsl:template match="wix:File[@Source='SourceDir\EntranceRandomizer.exe']">
-      <xsl:copy-of select="." />
-      <wix:Shortcut Id="ProgramShortcut"
-               Name="ALttP Entrance Randomizer"
-               Advertise="yes"
-               Description="ALttP Entrance Randomizer"
-               Directory="ApplicationProgramsFolder" />
-    </xsl:template>
-    <xsl:template match="wix:File[@Source='SourceDir\README.hmtl']">
-        <xsl:copy-of select="." />
-        <wix:Shortcut Id="ReadmeShortcut"
-                 Name="ALttP Entrance Randomizer README"
-                 Advertise="yes"
-                 Description="ALttP Entrance Randomizer README"
-                 Directory="ApplicationProgramsFolder" />
-      </xsl:template>
-
-</xsl:stylesheet>
diff --git a/bundle/installer.wxs b/bundle/installer.wxs
deleted file mode 100644
index f5d111d7..00000000
--- a/bundle/installer.wxs
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <!-- Setting the product ID to "*" means all upgrades are treated as major upgrades, and will uninstall the old version 
-         before installing the new one. This is desireable because it means nothing breaks if we fail to follow the component rules precisely. -->
-    <Product Id="*" Name="ALttP Entrance Randomizer" Language="1033" Version="$(env.ER_Version)" Manufacturer="Randomizer Community" UpgradeCode="0229C621-5F8A-4D59-962A-5826C58B93DD" >
-        <Package Id="*" InstallerVersion="400" Compressed="yes" InstallScope="perMachine" />
-        <!-- Allowing downgrades will cause a harmless warning to be emitted. This wearning is not relevant here, allowing downgrades via a new major upgrade is safe for a simple standalone app like this-->
-        <MajorUpgrade AllowDowngrades="yes"/>
-        <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
-        <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id='ProgramFilesFolder' Name='PFiles'>
-                <Directory Id='INSTALLDIR' Name='ALttP Entrance Randomizer'/>
-            </Directory>
-            <Directory Id="ProgramMenuFolder">
-                <Directory Id="ApplicationProgramsFolder" Name="ALttP Entrance Randomizer"/>
-            </Directory>
-        </Directory>
-        <DirectoryRef Id="ApplicationProgramsFolder">
-            <Component Id="ApplicationShortcut" Guid="0054698A-5A56-4B36-8176-8FEC1762EF2D">
-                <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
-                <RegistryValue Root="HKCU" Key="Software\ALttPEntranceRandomizer" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
-            </Component>
-        </DirectoryRef>
-        <Feature Id="Complete"
-             Title="ALttP Entrance Randomizer"
-             Description="ALttP Entrance Randomizer"
-             Level="1">
-            <ComponentGroupRef Id="ERFiles"/>
-            <ComponentRef Id="ApplicationShortcut"/>
-        </Feature>
-
-        <Icon Id="ER.ico" SourceFile="Data/ER.ico" />
-        <Property Id="DISABLEADVTSHORTCUTS" Secure="yes">1</Property>
-        <Property Id="ARPPRODUCTICON" Value="ER.ico" />
-        <Property Id="WIXUI_INSTALLDIR">INSTALLDIR</Property>
-        <UI>
-          <UIRef Id="WixUI_InstallDir" />
-          <UIRef Id="WixUI_ErrorProgressText" />
-          <!-- Skip license page -->
-          <Publish Dialog="WelcomeDlg"
-                    Control="Next"
-                    Event="NewDialog"
-                    Value="InstallDirDlg"
-                    Order="2">1</Publish>
-          <Publish Dialog="InstallDirDlg"
-                    Control="Back"
-                    Event="NewDialog"
-                    Value="WelcomeDlg"
-                    Order="2">1</Publish>
-        </UI>
-    </Product>
-</Wix>
diff --git a/setup.py b/setup.py
index 57e6f245..fd6ca17d 100644
--- a/setup.py
+++ b/setup.py
@@ -96,7 +96,7 @@ def installfile(path):
         print('Warning,', path, 'not found')
 
 
-extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml"]
+extra_data = ["LICENSE", "data", "EnemizerCLI", "host.yaml", "QUsb2Snes"]
 
 for data in extra_data:
     installfile(Path(data))