prep for 1.4 compiled release

This commit is contained in:
Fabian Dill 2020-02-11 15:07:21 +01:00
parent 81051aebba
commit c4ba281645
6 changed files with 2 additions and 131 deletions

1
.gitignore vendored
View File

@ -17,3 +17,4 @@ RaceRom.py
weights/
/MultiMystery/
/Players/
/QUsb2Snes/

View File

@ -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)

View File

@ -1,4 +0,0 @@
import sys
import os
sys.path.append(os.path.join(sys._MEIPASS, "ext"))

View File

@ -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>

View File

@ -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>

View File

@ -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))