ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00
Code Issues Projects Releases Wiki Activity

Revert some non-Python3 related changes

Browse Source
This commit is contained in:
Jonathan Harris 2019-09-29 18:25:03 +01:00 committed by Athanasius
parent 3c46e8d5fa
commit 14ed4bd888
4 changed files with 453 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

898
EDMarketConnector.wxs
View File

@ -113,421 +113,404 @@
<File Id="EDMarketConnector.exe" KeyPath="yes" Source="SourceDir\EDMarketConnector.exe" /> <File Id="EDMarketConnector.exe" KeyPath="yes" Source="SourceDir\EDMarketConnector.exe" />
<Shortcut Id="MainExeShortcut" Directory="ProgramMenuFolder" Name="$(var.PRODUCTLONGNAME)" Description="Downloads station data from Elite: Dangerous" WorkingDirectory="INSTALLDIR" Icon="EDMarketConnector.exe" IconIndex="0" Advertise="yes" /> <Shortcut Id="MainExeShortcut" Directory="ProgramMenuFolder" Name="$(var.PRODUCTLONGNAME)" Description="Downloads station data from Elite: Dangerous" WorkingDirectory="INSTALLDIR" Icon="EDMarketConnector.exe" IconIndex="0" Advertise="yes" />
</Component> </Component>
<Component Id="cacert.pem" Guid="{62DF41B7-0BE8-48F3-BB22-90E9201A6D8C}"> <Component Guid="{842DC919-EC3D-48EF-A6B3-9A81608E0FB9}">
<File Id="cacert.pem" KeyPath="yes" Source="SourceDir\cacert.pem" /> <File KeyPath="yes" Source="SourceDir\_bz2.pyd" />
</Component> </Component>
<Component Id="commodity.csv" Guid="*"> <Component Guid="{433C38E1-F736-4546-AA83-FCD8B0AAA39B}">
<File Id="commodity.csv" KeyPath="yes" Source="SourceDir\commodity.csv" /> <File KeyPath="yes" Source="SourceDir\_ctypes.pyd" />
</Component> </Component>
<Component Id="EDMarketConnector.ico" Guid="{6762E871-5FA1-4C2F-A3C9-6A9954CC018C}"> <Component Guid="*">
<File Id="EDMarketConnector.ico" KeyPath="yes" Source="SourceDir\EDMarketConnector.ico" /> <File KeyPath="yes" Source="SourceDir\_elementtree.pyd" />
</Component> </Component>
<Component Id="EDMarketConnector.VisualElementsManifest.xml" Guid="{9A0CB8A2-7167-492F-A185-0BDF7E9F5C01}"> <Component Guid="{45803711-A2A6-4DA8-8219-F625DE6DB33E}">
<File Id="EDMarketConnector.VisualElementsManifest.xml" KeyPath="yes" Source="SourceDir\EDMarketConnector.VisualElementsManifest.xml" /> <File KeyPath="yes" Source="SourceDir\_hashlib.pyd" />
</Component> </Component>
<Component Id="EDMC.exe" Guid="*"> <Component Guid="*">
<File Id="EDMC.exe" KeyPath="yes" Source="SourceDir\EDMC.exe" /> <File KeyPath="yes" Source="SourceDir\_lzma.pyd" />
</Component> </Component>
<Component Id="EUROCAPS.TTF" Guid="*"> <Component Guid="*">
<File Id="EUROCAPS.TTF" KeyPath="yes" Source="SourceDir\EUROCAPS.TTF" /> <File KeyPath="yes" Source="SourceDir\_queue.pyd" />
</Component> </Component>
<Component Id="library.zip" Guid="{A18814B6-B491-42AB-A433-2AD66A823AD7}"> <Component Guid="{52019FB5-952D-4BA4-A6E0-F3E214F14923}">
<File Id="library.zip" KeyPath="yes" Source="SourceDir\library.zip" /> <File KeyPath="yes" Source="SourceDir\_socket.pyd" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\_sqlite3.pyd" />
</Component>
<Component Guid="{2EA8F0B6-A104-4D31-99F0-3535ACDC26A9}">
<File KeyPath="yes" Source="SourceDir\_ssl.pyd" />
</Component>
<Component Guid="{D2F0CDD2-E934-419F-BC99-445E8FD3AF24}">
<File KeyPath="yes" Source="SourceDir\_tkinter.pyd" />
</Component>
<Component Guid="{62DF41B7-0BE8-48F3-BB22-90E9201A6D8C}">
<File KeyPath="yes" Source="SourceDir\cacert.pem" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\commodity.csv" />
</Component>
<Component Guid="{6762E871-5FA1-4C2F-A3C9-6A9954CC018C}">
<File KeyPath="yes" Source="SourceDir\EDMarketConnector.ico" />
</Component>
<Component Guid="{9A0CB8A2-7167-492F-A185-0BDF7E9F5C01}">
<File KeyPath="yes" Source="SourceDir\EDMarketConnector.VisualElementsManifest.xml" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\EDMC.exe" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\EUROCAPS.TTF" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\libcrypto-1_1.dll" />
</Component>
<Component Guid="{A18814B6-B491-42AB-A433-2AD66A823AD7}">
<File KeyPath="yes" Source="SourceDir\library.zip" />
</Component> </Component>
<Component Id="libcrypto_1_1.dll" Guid="*">
<File Id="libcrypto_1_1.dll" KeyPath="yes" Source="SourceDir\libcrypto-1_1.dll" />
</Component>
<Component Id="libssl_1_1.dll" Guid="*"> <Component Id="libssl_1_1.dll" Guid="*">
<File Id="libssl_1_1.dll" KeyPath="yes" Source="SourceDir\libssl-1_1.dll" /> <File Id="libssl_1_1.dll" KeyPath="yes" Source="SourceDir\libssl-1_1.dll" />
</Component>
<Component Id="modules.p" Guid="*">
<File Id="modules.p" KeyPath="yes" Source="SourceDir\modules.p" />
</Component>
<Component Id="pyexpat.pyd" Guid="{87A99AAA-792F-4092-9D00-5106D99D00AD}">
<File Id="pyexpat.pyd" KeyPath="yes" Source="SourceDir\pyexpat.pyd" />
</Component>
<Component Id="python37.dll" Guid="*">
<File Id="python37.dll" KeyPath="yes" Source="SourceDir\python37.dll" />
</Component>
<Component Id="rare_commodity.csv" Guid="*">
<File Id="rare_commodity.csv" KeyPath="yes" Source="SourceDir\rare_commodity.csv" />
</Component>
<Component Id="select.pyd" Guid="{9DBAB544-E815-40A5-866A-391B68919344}">
<File Id="select.pyd" KeyPath="yes" Source="SourceDir\select.pyd" />
</Component>
<Component Id="ships.p" Guid="*">
<File Id="ships.p" KeyPath="yes" Source="SourceDir\ships.p" />
</Component>
<Component Id="snd_bad.wav" Guid="*">
<File Id="snd_bad.wav" KeyPath="yes" Source="SourceDir\snd_bad.wav" />
</Component>
<Component Id="snd_good.wav" Guid="*">
<File Id="snd_good.wav" KeyPath="yes" Source="SourceDir\snd_good.wav" />
</Component>
<Component Id="stations.p" Guid="*">
<File Id="stations.p" KeyPath="yes" Source="SourceDir\stations.p" />
</Component>
<Component Id="systems.p" Guid="*">
<File Id="systems.p" KeyPath="yes" Source="SourceDir\systems.p" />
</Component>
<Component Id="tcl86t.dll" Guid="*">
<File Id="tcl86t.dll" KeyPath="yes" Source="SourceDir\tcl86t.dll" />
</Component>
<Component Id="tk86t.dll" Guid="*">
<File Id="tk86t.dll" KeyPath="yes" Source="SourceDir\tk86t.dll" />
</Component>
<Component Id="unicodedata.pyd" Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">
<File Id="unicodedata.pyd" KeyPath="yes" Source="SourceDir\unicodedata.pyd" />
</Component>
<Component Id="winsound.pyd" Guid="*">
<File Id="winsound.pyd" KeyPath="yes" Source="SourceDir\winsound.pyd" />
</Component>
<Component Id="WinSparkle.dll" Guid="{3117D2CF-1D87-4B99-BE44-7BDDFE8C8E60}">
<File Id="WinSparkle.dll" KeyPath="yes" Source="SourceDir\WinSparkle.dll" />
</Component>
<Component Id="_bz2.pyd" Guid="*">
<File Id="_bz2.pyd" KeyPath="yes" Source="SourceDir\_bz2.pyd" />
</Component>
<Component Id="_ctypes.pyd" Guid="{433C38E1-F736-4546-AA83-FCD8B0AAA39B}">
<File Id="_ctypes.pyd" KeyPath="yes" Source="SourceDir\_ctypes.pyd" />
</Component>
<Component Id="_decimal.pyd" Guid="*">
<File Id="_decimal.pyd" KeyPath="yes" Source="SourceDir\_decimal.pyd" />
</Component>
<Component Id="_elementtree.pyd" Guid="*">
<File Id="_elementtree.pyd" KeyPath="yes" Source="SourceDir\_elementtree.pyd" />
</Component>
<Component Id="_hashlib.pyd" Guid="{45803711-A2A6-4DA8-8219-F625DE6DB33E}">
<File Id="_hashlib.pyd" KeyPath="yes" Source="SourceDir\_hashlib.pyd" />
</Component>
<Component Id="_lzma.pyd" Guid="*">
<File Id="_lzma.pyd" KeyPath="yes" Source="SourceDir\_lzma.pyd" />
</Component>
<Component Id="_multiprocessing.pyd" Guid="*">
<File Id="_multiprocessing.pyd" KeyPath="yes" Source="SourceDir\_multiprocessing.pyd" />
</Component>
<Component Id="_queue.pyd" Guid="*">
<File Id="_queue.pyd" KeyPath="yes" Source="SourceDir\_queue.pyd" />
</Component>
<Component Id="_socket.pyd" Guid="*">
<File Id="_socket.pyd" KeyPath="yes" Source="SourceDir\_socket.pyd" />
</Component>
<Component Id="sqlite3.dll" Guid="*">
<File Id="sqlite3.dll" KeyPath="yes" Source="SourceDir\sqlite3.dll" />
</Component> </Component>
<Component Id="_sqlite3.pyd" Guid="*"> <Component Guid="*">
<File Id="_sqlite3.pyd" KeyPath="yes" Source="SourceDir\_sqlite3.pyd" /> <File KeyPath="yes" Source="SourceDir\modules.p" />
</Component> </Component>
<Component Id="_ssl.pyd" Guid="{2EA8F0B6-A104-4D31-99F0-3535ACDC26A9}"> <Component Guid="{87A99AAA-792F-4092-9D00-5106D99D00AD}">
<File Id="_ssl.pyd" KeyPath="yes" Source="SourceDir\_ssl.pyd" /> <File KeyPath="yes" Source="SourceDir\pyexpat.pyd" />
</Component> </Component>
<Component Id="_testcapi.pyd" Guid="*"> <Component Guid="{685773F2-78E4-4A16-BE0D-C7AB9575C856}">
<File Id="_testcapi.pyd" KeyPath="yes" Source="SourceDir\_testcapi.pyd" /> <File KeyPath="yes" Source="SourceDir\python37.dll" />
</Component> </Component>
<Component Id="_tkinter.pyd" Guid="{D2F0CDD2-E934-419F-BC99-445E8FD3AF24}"> <Component Guid="*">
<File Id="_tkinter.pyd" KeyPath="yes" Source="SourceDir\_tkinter.pyd" /> <File KeyPath="yes" Source="SourceDir\rare_commodity.csv" />
</Component> </Component>
<Directory Id="L10n" Name="L10n"> <Component Guid="{9DBAB544-E815-40A5-866A-391B68919344}">
<Component Id="cs.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\select.pyd" />
<File Id="cs.strings" KeyPath="yes" Source="SourceDir\L10n\cs.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="de.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\ships.p" />
<File Id="de.strings" KeyPath="yes" Source="SourceDir\L10n\de.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="es.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\snd_good.wav" />
<File Id="es.strings" KeyPath="yes" Source="SourceDir\L10n\es.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="fi.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\snd_bad.wav" />
<File Id="fi.strings" KeyPath="yes" Source="SourceDir\L10n\fi.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="fr.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\sqlite3.dll" />
<File Id="fr.strings" KeyPath="yes" Source="SourceDir\L10n\fr.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="hu.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\stations.p" />
<File Id="hu.strings" KeyPath="yes" Source="SourceDir\L10n\hu.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="it.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\systems.p" />
<File Id="it.strings" KeyPath="yes" Source="SourceDir\L10n\it.strings" /> </Component>
</Component> <Component Guid="{30EEAD30-A43B-4A31-A209-450A8AD17AC2}">
<Component Id="ja.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\tcl86t.dll" />
<File Id="ja.strings" KeyPath="yes" Source="SourceDir\L10n\ja.strings" /> </Component>
</Component> <Component Guid="{CE5A6F3A-8F6B-4C16-BCDC-F1BB89C9F1AF}">
<Component Id="lv.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\tk86t.dll" />
<File Id="lv.strings" KeyPath="yes" Source="SourceDir\L10n\lv.strings" /> </Component>
</Component> <Component Guid="{E8E3701A-8AA1-4D46-A56D-7AF08D6AFCD4}">
<Component Id="nl.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\unicodedata.pyd" />
<File Id="nl.strings" KeyPath="yes" Source="SourceDir\L10n\nl.strings" /> </Component>
</Component> <Component Guid="*">
<Component Id="pl.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\winsound.pyd" />
<File Id="pl.strings" KeyPath="yes" Source="SourceDir\L10n\pl.strings" /> </Component>
</Component> <Component Guid="{3117D2CF-1D87-4B99-BE44-7BDDFE8C8E60}">
<Component Id="pt_BR.strings" Guid="*"> <File KeyPath="yes" Source="SourceDir\WinSparkle.dll" />
<File Id="pt_BR.strings" KeyPath="yes" Source="SourceDir\L10n\pt-BR.strings" /> </Component>
</Component> <Directory Id="L10n" Name="L10n">
<Component Id="pt_PT.strings" Guid="*"> <Component Guid="*">
<File Id="pt_PT.strings" KeyPath="yes" Source="SourceDir\L10n\pt-PT.strings" /> <File KeyPath="yes" Source="SourceDir\L10n\cs.strings" />
</Component> </Component>
<Component Id="ru.strings" Guid="*"> <Component Guid="*">
<File Id="ru.strings" KeyPath="yes" Source="SourceDir\L10n\ru.strings" /> <File KeyPath="yes" Source="SourceDir\L10n\de.strings" />
</Component> </Component>
<Component Id="sr_Latn.strings" Guid="*"> <Component Guid="*">
<File Id="sr_Latn.strings" KeyPath="yes" Source="SourceDir\L10n\sr-Latn.strings" /> <File KeyPath="yes" Source="SourceDir\L10n\es.strings" />
</Component> </Component>
<Component Id="uk.strings" Guid="*"> <Component Guid="*">
<File Id="uk.strings" KeyPath="yes" Source="SourceDir\L10n\uk.strings" /> <File KeyPath="yes" Source="SourceDir\L10n\fi.strings" />
</Component> </Component>
<Component Id="zh_Hans.strings" Guid="*"> <Component Guid="*">
<File Id="zh_Hans.strings" KeyPath="yes" Source="SourceDir\L10n\zh-Hans.strings" /> <File KeyPath="yes" Source="SourceDir\L10n\fr.strings" />
</Component> </Component>
</Directory> <Component Guid="*">
<Directory Id="lib" Name="lib"> <File KeyPath="yes" Source="SourceDir\L10n\hu.strings" />
<Directory Id="tcl" Name="tcl"> </Component>
<Component Id="auto.tcl" Guid="*"> <Component Guid="*">
<File Id="auto.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\auto.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\it.strings" />
</Component> </Component>
<Component Id="clock.tcl" Guid="*"> <Component Guid="*">
<File Id="clock.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\clock.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\ja.strings" />
</Component> </Component>
<Component Id="history.tcl" Guid="*"> <Component Guid="*">
<File Id="history.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\history.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\lv.strings" />
</Component> </Component>
<Component Id="init.tcl" Guid="*"> <Component Guid="*">
<File Id="init.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\init.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\nl.strings" />
</Component> </Component>
<Component Id="package.tcl" Guid="*"> <Component Guid="*">
<File Id="package.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\package.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\pl.strings" />
</Component> </Component>
<Component Id="parray.tcl" Guid="*"> <Component Guid="*">
<File Id="parray.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\parray.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\pt-BR.strings" />
</Component> </Component>
<Component Id="safe.tcl" Guid="*"> <Component Guid="*">
<File Id="safe.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\safe.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\pt-PT.strings" />
</Component> </Component>
<Component Id="tclIndex" Guid="*"> <Component Guid="*">
<File Id="tclIndex" KeyPath="yes" Source="SourceDir\lib\tcl\tclIndex" /> <File KeyPath="yes" Source="SourceDir\L10n\ru.strings" />
</Component> </Component>
<Component Id="tm.tcl" Guid="*"> <Component Guid="*">
<File Id="tm.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\tm.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\sr-Latn.strings" />
</Component> </Component>
<Component Id="word.tcl" Guid="*"> <Component Guid="*">
<File Id="word.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\word.tcl" /> <File KeyPath="yes" Source="SourceDir\L10n\uk.strings" />
</Component> </Component>
<Directory Id="http1.0" Name="http1.0"> <Component Guid="*">
<Component Id="http.tcl" Guid="*"> <File KeyPath="yes" Source="SourceDir\L10n\zh-Hans.strings" Name="zh-CN.strings" />
<File Id="http.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\http1.0\http.tcl" /> </Component>
</Component> </Directory>
<Component Id="pkgIndex.tcl" Guid="*"> <Directory Id="lib" Name="lib">
<File Id="pkgIndex.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\http1.0\pkgIndex.tcl" /> <Directory Id="tcl" Name="tcl">
</Component> <Component Guid="{C085794D-6644-4915-B1C3-3060BE9E3F3B}">
</Directory> <File KeyPath="yes" Source="SourceDir\lib\tcl\auto.tcl" />
<Directory Id="opt0.4" Name="opt0.4"> </Component>
<Component Id="optparse.tcl" Guid="*"> <Component Guid="{E7EF4423-9B28-4267-A6C9-1C5F5F732054}">
<File Id="optparse.tcl" KeyPath="yes" Source="SourceDir\lib\tcl\opt0.4\optparse.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\clock.tcl" />
</Component> </Component>
<Component Id="pkgIndex.tcl_1" Guid="*"> <Component Guid="{28C0596D-8D38-4E62-BE6E-E3986E1EB854}">
<File Id="pkgIndex.tcl_1" KeyPath="yes" Source="SourceDir\lib\tcl\opt0.4\pkgIndex.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\history.tcl" />
</Component> </Component>
</Directory> <Component Guid="{3E20540F-0017-40FA-94EC-A4407C0A9B3B}">
</Directory> <File KeyPath="yes" Source="SourceDir\lib\tcl\init.tcl" />
<Directory Id="tk" Name="tk"> </Component>
<Component Id="bgerror.tcl" Guid="*"> <Component Guid="{D3750297-0753-433F-A20F-FCB309050DCE}">
<File Id="bgerror.tcl" KeyPath="yes" Source="SourceDir\lib\tk\bgerror.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\package.tcl" />
</Component> </Component>
<Component Id="button.tcl" Guid="*"> <Component Guid="{8686095A-7B3D-4352-B30C-497E3DAABD57}">
<File Id="button.tcl" KeyPath="yes" Source="SourceDir\lib\tk\button.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\parray.tcl" />
</Component> </Component>
<Component Id="choosedir.tcl" Guid="*"> <Component Guid="{DAAAF7FC-8255-4564-B4F9-42865C1D1B74}">
<File Id="choosedir.tcl" KeyPath="yes" Source="SourceDir\lib\tk\choosedir.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\safe.tcl" />
</Component> </Component>
<Component Id="clrpick.tcl" Guid="*"> <Component Id="tclIndex_1" Guid="{52C48E34-AE8C-4461-BB3D-817EF66E859A}">
<File Id="clrpick.tcl" KeyPath="yes" Source="SourceDir\lib\tk\clrpick.tcl" /> <File Id="tclIndex_1" KeyPath="yes" Source="SourceDir\lib\tcl\tclIndex" />
</Component> </Component>
<Component Id="comdlg.tcl" Guid="*"> <Component Guid="{84CAEEAD-0290-4895-BEDB-6CB10B8BEECE}">
<File Id="comdlg.tcl" KeyPath="yes" Source="SourceDir\lib\tk\comdlg.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\tm.tcl" />
</Component> </Component>
<Component Id="console.tcl" Guid="*"> <Component Guid="{3D7917B8-E131-448F-9F2C-18705BB37313}">
<File Id="console.tcl" KeyPath="yes" Source="SourceDir\lib\tk\console.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tcl\word.tcl" />
</Component> </Component>
<Component Id="dialog.tcl" Guid="*"> <Directory Id="opt0.4" Name="opt0.4">
<File Id="dialog.tcl" KeyPath="yes" Source="SourceDir\lib\tk\dialog.tcl" /> <Component Guid="{D8E99FE8-AD1E-4E73-A566-6D88B7E5F07E}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tcl\opt0.4\optparse.tcl" />
<Component Id="entry.tcl" Guid="*"> </Component>
<File Id="entry.tcl" KeyPath="yes" Source="SourceDir\lib\tk\entry.tcl" /> <Component Id="pkgIndex.tcl_1" Guid="{9618212A-46A6-4982-AB85-599CEB0711EB}">
</Component> <File Id="pkgIndex.tcl_1" KeyPath="yes" Source="SourceDir\lib\tcl\opt0.4\pkgIndex.tcl" />
<Component Id="focus.tcl" Guid="*"> </Component>
<File Id="focus.tcl" KeyPath="yes" Source="SourceDir\lib\tk\focus.tcl" /> </Directory>
</Component> </Directory>
<Component Id="fontchooser.tcl" Guid="*"> <Directory Id="tk" Name="tk">
<File Id="fontchooser.tcl" KeyPath="yes" Source="SourceDir\lib\tk\fontchooser.tcl" /> <Component Guid="{FCB37425-AD3A-45DA-91D7-053AF7970C28}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\bgerror.tcl" />
<Component Id="iconlist.tcl" Guid="*"> </Component>
<File Id="iconlist.tcl" KeyPath="yes" Source="SourceDir\lib\tk\iconlist.tcl" /> <Component Id="button.tcl_1" Guid="{149136E1-0EAE-42B2-8509-5B6A686B023B}">
</Component> <File Id="button.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\button.tcl" />
<Component Id="icons.tcl" Guid="*"> </Component>
<File Id="icons.tcl" KeyPath="yes" Source="SourceDir\lib\tk\icons.tcl" /> <Component Guid="{EAC4BD6C-40E9-4C64-A5F5-258D083D07C0}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\choosedir.tcl" />
<Component Id="license.terms" Guid="*"> </Component>
<File Id="license.terms" KeyPath="yes" Source="SourceDir\lib\tk\license.terms" /> <Component Guid="{0E8924C5-7EA5-43AC-9C81-6F3029B462C8}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\clrpick.tcl" />
<Component Id="listbox.tcl" Guid="*"> </Component>
<File Id="listbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\listbox.tcl" /> <Component Guid="{7B5F5CA4-893A-480F-B6AF-C3E3A544DB8B}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\comdlg.tcl" />
<Component Id="megawidget.tcl" Guid="*"> </Component>
<File Id="megawidget.tcl" KeyPath="yes" Source="SourceDir\lib\tk\megawidget.tcl" /> <Component Guid="{A8F00EE2-4094-4DFF-86BD-FE969D4D362A}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\console.tcl" />
<Component Id="menu.tcl" Guid="*"> </Component>
<File Id="menu.tcl" KeyPath="yes" Source="SourceDir\lib\tk\menu.tcl" /> <Component Guid="{DFFA82C4-0949-41A3-868A-1BC4CF04CC76}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\dialog.tcl" />
<Component Id="mkpsenc.tcl" Guid="*"> </Component>
<File Id="mkpsenc.tcl" KeyPath="yes" Source="SourceDir\lib\tk\mkpsenc.tcl" /> <Component Id="entry.tcl_1" Guid="{D3BD7C0B-06D7-4619-977B-F30908EF20ED}">
</Component> <File Id="entry.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\entry.tcl" />
<Component Id="msgbox.tcl" Guid="*"> </Component>
<File Id="msgbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\msgbox.tcl" /> <Component Guid="{DF8A00BF-91F1-44D8-B1D4-AB1104BFD1C9}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\focus.tcl" />
<Component Id="obsolete.tcl" Guid="*"> </Component>
<File Id="obsolete.tcl" KeyPath="yes" Source="SourceDir\lib\tk\obsolete.tcl" /> <Component Guid="*">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\fontchooser.tcl" />
<Component Id="optMenu.tcl" Guid="*"> </Component>
<File Id="optMenu.tcl" KeyPath="yes" Source="SourceDir\lib\tk\optMenu.tcl" /> <Component Guid="*">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\iconlist.tcl" />
<Component Id="palette.tcl" Guid="*"> </Component>
<File Id="palette.tcl" KeyPath="yes" Source="SourceDir\lib\tk\palette.tcl" /> <Component Guid="*">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\icons.tcl" />
<Component Id="panedwindow.tcl" Guid="*"> </Component>
<File Id="panedwindow.tcl" KeyPath="yes" Source="SourceDir\lib\tk\panedwindow.tcl" /> <Component Guid="{A545EB30-9E1A-4C89-866B-974C99004065}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\license.terms" />
<Component Id="pkgIndex.tcl_2" Guid="*"> </Component>
<File Id="pkgIndex.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\pkgIndex.tcl" /> <Component Guid="{A8F779C3-8947-4C8D-9611-83F1D05482A7}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\listbox.tcl" />
<Component Id="safetk.tcl" Guid="*"> </Component>
<File Id="safetk.tcl" KeyPath="yes" Source="SourceDir\lib\tk\safetk.tcl" /> <Component Guid="{E492B863-5AAA-4A2A-AC0B-10F2B3A90D89}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\menu.tcl" />
<Component Id="scale.tcl" Guid="*"> </Component>
<File Id="scale.tcl" KeyPath="yes" Source="SourceDir\lib\tk\scale.tcl" /> <Component Guid="*">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\megawidget.tcl" />
<Component Id="scrlbar.tcl" Guid="*"> </Component>
<File Id="scrlbar.tcl" KeyPath="yes" Source="SourceDir\lib\tk\scrlbar.tcl" /> <Component Guid="{9BBAC909-602C-443B-9EFE-6896D468BE3F}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\mkpsenc.tcl" />
<Component Id="spinbox.tcl" Guid="*"> </Component>
<File Id="spinbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\spinbox.tcl" /> <Component Guid="{0F1A63FD-16BA-4603-8E9D-744BC4CD5C25}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\msgbox.tcl" />
<Component Id="tclIndex_1" Guid="*"> </Component>
<File Id="tclIndex_1" KeyPath="yes" Source="SourceDir\lib\tk\tclIndex" /> <Component Guid="{4EDE9077-0998-42D9-8510-E60440003628}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\obsolete.tcl" />
<Component Id="tearoff.tcl" Guid="*"> </Component>
<File Id="tearoff.tcl" KeyPath="yes" Source="SourceDir\lib\tk\tearoff.tcl" /> <Component Guid="{10D09DFC-4B7D-4869-ACBC-53C864C54CD0}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\optMenu.tcl" />
<Component Id="text.tcl" Guid="*"> </Component>
<File Id="text.tcl" KeyPath="yes" Source="SourceDir\lib\tk\text.tcl" /> <Component Guid="{EA101ACF-9743-495F-B514-A28F78F23068}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\palette.tcl" />
<Component Id="tk.tcl" Guid="*"> </Component>
<File Id="tk.tcl" KeyPath="yes" Source="SourceDir\lib\tk\tk.tcl" /> <Component Id="panedwindow.tcl_1" Guid="{7060F5A9-BAB5-4D15-A65E-04A71AE00A15}">
</Component> <File Id="panedwindow.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\panedwindow.tcl" />
<Component Id="tkfbox.tcl" Guid="*"> </Component>
<File Id="tkfbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\tkfbox.tcl" /> <Component Id="pkgIndex.tcl_2" Guid="{5E2762E6-F8DE-43A9-A809-32AE03522482}">
</Component> <File Id="pkgIndex.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\pkgIndex.tcl" />
<Component Id="unsupported.tcl" Guid="*"> </Component>
<File Id="unsupported.tcl" KeyPath="yes" Source="SourceDir\lib\tk\unsupported.tcl" /> <Component Guid="{DE3DA121-B02A-43AA-9D36-99A89F26B3B4}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\safetk.tcl" />
<Component Id="xmfbox.tcl" Guid="*"> </Component>
<File Id="xmfbox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\xmfbox.tcl" /> <Component Id="scale.tcl_1" Guid="{7E371EB8-CBE1-4360-A1B8-08A54DEEFAE5}">
</Component> <File Id="scale.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\scale.tcl" />
<Directory Id="ttk" Name="ttk"> </Component>
<Component Id="altTheme.tcl" Guid="*"> <Component Guid="{AADDC754-698D-4439-82A1-4F47FE97FA94}">
<File Id="altTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\altTheme.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\scrlbar.tcl" />
</Component> </Component>
<Component Id="aquaTheme.tcl" Guid="*"> <Component Id="spinbox.tcl_1" Guid="{448FB04F-1719-4BE0-8192-9DB3551FF1CA}">
<File Id="aquaTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\aquaTheme.tcl" /> <File Id="spinbox.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\spinbox.tcl" />
</Component> </Component>
<Component Id="button.tcl_2" Guid="*"> <Component Id="tclIndex_2" Guid="{CC6A73B5-7CBF-43F5-BA1D-67216081B7CD}">
<File Id="button.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\button.tcl" /> <File Id="tclIndex_2" KeyPath="yes" Source="SourceDir\lib\tk\tclIndex" />
</Component> </Component>
<Component Id="clamTheme.tcl" Guid="*"> <Component Guid="{AEAAB0BF-64DA-4729-8AA3-A964758524F2}">
<File Id="clamTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\clamTheme.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\tearoff.tcl" />
</Component> </Component>
<Component Id="classicTheme.tcl" Guid="*"> <Component Guid="{DFCA1825-61D8-4613-A0DF-7FAFC9E8D0B7}">
<File Id="classicTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\classicTheme.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\text.tcl" />
</Component> </Component>
<Component Id="combobox.tcl" Guid="*"> <Component Guid="{80245D25-A889-4EB2-9C9C-488AB3C32A32}">
<File Id="combobox.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\combobox.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\tk.tcl" />
</Component> </Component>
<Component Id="cursors.tcl" Guid="*"> <Component Guid="{50929058-A5C7-43E3-B5FE-B848A419CF93}">
<File Id="cursors.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\cursors.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\tkfbox.tcl" />
</Component> </Component>
<Component Id="defaults.tcl" Guid="*"> <Component Guid="{2B892993-9862-466F-A79B-F54246A9E7F2}">
<File Id="defaults.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\defaults.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\unsupported.tcl" />
</Component> </Component>
<Component Id="entry.tcl_1" Guid="*"> <Component Guid="{F7B0AE86-0EA3-436D-83A0-61FB4AEBBDF8}">
<File Id="entry.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\ttk\entry.tcl" /> <File KeyPath="yes" Source="SourceDir\lib\tk\xmfbox.tcl" />
</Component> </Component>
<Component Id="fonts.tcl" Guid="*"> <Directory Id="ttk" Name="ttk">
<File Id="fonts.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\fonts.tcl" /> <Component Guid="{153EA00B-70D3-45D5-B6C7-F900D15AF3C7}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\altTheme.tcl" />
<Component Id="menubutton.tcl" Guid="*"> </Component>
<File Id="menubutton.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\menubutton.tcl" /> <Component Guid="{F97CA810-C233-4088-87FB-5DE062166893}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\aquaTheme.tcl" />
<Component Id="notebook.tcl" Guid="*"> </Component>
<File Id="notebook.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\notebook.tcl" /> <Component Id="button.tcl_2" Guid="{2C2F700C-7C62-4F5A-908C-A35B122A577B}">
</Component> <File Id="button.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\button.tcl" />
<Component Id="panedwindow.tcl_1" Guid="*"> </Component>
<File Id="panedwindow.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\ttk\panedwindow.tcl" /> <Component Guid="{9137EAD5-A5ED-4280-AB41-5B42CB76BE25}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\clamTheme.tcl" />
<Component Id="progress.tcl" Guid="*"> </Component>
<File Id="progress.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\progress.tcl" /> <Component Guid="{B9D2363E-CBE6-4D6A-8AEC-8763FCF41309}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\classicTheme.tcl" />
<Component Id="scale.tcl_1" Guid="*"> </Component>
<File Id="scale.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\ttk\scale.tcl" /> <Component Guid="{BB9DC352-388A-4424-B3A7-D0CC0799B0E8}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\combobox.tcl" />
<Component Id="scrollbar.tcl" Guid="*"> </Component>
<File Id="scrollbar.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\scrollbar.tcl" /> <Component Guid="{D5B1A052-87F1-44C9-A8D6-6FF78EC6453A}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\cursors.tcl" />
<Component Id="sizegrip.tcl" Guid="*"> </Component>
<File Id="sizegrip.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\sizegrip.tcl" /> <Component Guid="{2D4A6C0F-16CC-458F-936E-68F39BB51DC5}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\defaults.tcl" />
<Component Id="spinbox.tcl_1" Guid="*"> </Component>
<File Id="spinbox.tcl_1" KeyPath="yes" Source="SourceDir\lib\tk\ttk\spinbox.tcl" /> <Component Id="entry.tcl_2" Guid="{5BBDDCE5-3165-431C-8A5F-88C090EB98DA}">
</Component> <File Id="entry.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\entry.tcl" />
<Component Id="treeview.tcl" Guid="*"> </Component>
<File Id="treeview.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\treeview.tcl" /> <Component Guid="{D0DACDE6-4F3A-4BC2-AE09-7BBF8C76ED74}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\fonts.tcl" />
<Component Id="ttk.tcl" Guid="*"> </Component>
<File Id="ttk.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\ttk.tcl" /> <Component Guid="{133F83FA-ACE2-44FF-B175-42F2E0A917A9}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\menubutton.tcl" />
<Component Id="utils.tcl" Guid="*"> </Component>
<File Id="utils.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\utils.tcl" /> <Component Guid="{641B8DCD-E718-4757-84AB-6425D3CFDCD6}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\notebook.tcl" />
<Component Id="vistaTheme.tcl" Guid="*"> </Component>
<File Id="vistaTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\vistaTheme.tcl" /> <Component Id="panedwindow.tcl_2" Guid="{AF0A3619-F409-479B-A71E-1D2C08A5F510}">
</Component> <File Id="panedwindow.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\panedwindow.tcl" />
<Component Id="winTheme.tcl" Guid="*"> </Component>
<File Id="winTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\winTheme.tcl" /> <Component Guid="{3E9DE75A-FD32-4F7E-A3E7-59ABFBCBC9DF}">
</Component> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\progress.tcl" />
<Component Id="xpTheme.tcl" Guid="*"> </Component>
<File Id="xpTheme.tcl" KeyPath="yes" Source="SourceDir\lib\tk\ttk\xpTheme.tcl" /> <Component Id="scale.tcl_2" Guid="{165FED9E-A3F0-4005-8DA8-D25E4E144DD8}">
</Component> <File Id="scale.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\scale.tcl" />
</Directory> </Component>
</Directory> <Component Guid="{735AFCC5-A597-4292-B144-4DF8865B4200}">
</Directory> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\scrollbar.tcl" />
<Directory Id="plugins" Name="plugins"> </Component>
<Component Id="coriolis.py" Guid="*"> <Component Guid="{54AD42EB-7305-45AA-953C-574921E90BAD}">
<File Id="coriolis.py" KeyPath="yes" Source="SourceDir\plugins\coriolis.py" /> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\sizegrip.tcl" />
</Component> </Component>
<Component Id="eddb.py" Guid="*"> <Component Id="spinbox.tcl_2" Guid="{F4A91FAD-5F8D-4007-B38E-2C706E87770B}">
<File Id="eddb.py" KeyPath="yes" Source="SourceDir\plugins\eddb.py" /> <File Id="spinbox.tcl_2" KeyPath="yes" Source="SourceDir\lib\tk\ttk\spinbox.tcl" />
</Component> </Component>
<Component Id="eddn.py" Guid="*"> <Component Guid="{FC12F75C-6EF1-4AD5-BF60-55FC5E825605}">
<File Id="eddn.py" KeyPath="yes" Source="SourceDir\plugins\eddn.py" /> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\treeview.tcl" />
</Component> </Component>
<Component Id="edsm.py" Guid="*"> <Component Guid="{947E3D83-15D1-44E5-B8D3-5EEBDD18B343}">
<File Id="edsm.py" KeyPath="yes" Source="SourceDir\plugins\edsm.py" /> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\ttk.tcl" />
</Component> </Component>
<Component Id="edsy.py" Guid="*"> <Component Guid="{D5534AC6-9A1B-4CE3-90E1-6B65D4FF86D6}">
<File Id="edsy.py" KeyPath="yes" Source="SourceDir\plugins\edsy.py" /> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\utils.tcl" />
</Component> </Component>
<Component Id="inara.py" Guid="*"> <Component Guid="{198ADB32-56DD-4F29-B862-817DD6E92ECA}">
<File Id="inara.py" KeyPath="yes" Source="SourceDir\plugins\inara.py" /> <File KeyPath="yes" Source="SourceDir\lib\tk\ttk\vistaTheme.tcl" />
</Component> </Component>
</Directory> <Component Guid="{92589FA4-E08B-4E45-856E-F266D6290E2A}">
<File KeyPath="yes" Source="SourceDir\lib\tk\ttk\winTheme.tcl" />
</Component>
<Component Guid="{78CB3D2B-5032-445B-82C5-CFD32584A238}">
<File KeyPath="yes" Source="SourceDir\lib\tk\ttk\xpTheme.tcl" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="plugins" Name="plugins">
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\coriolis.py" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\eddb.py" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\eddn.py" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\edsm.py" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\edsy.py" />
</Component>
<Component Guid="*">
<File KeyPath="yes" Source="SourceDir\plugins\inara.py" />
</Component>
</Directory>
</Directory> </Directory>
</Directory> </Directory>
@ -539,61 +522,58 @@
<Feature Id='Complete' Level='1'> <Feature Id='Complete' Level='1'>
<ComponentRef Id="RegistryEntries" /> <ComponentRef Id="RegistryEntries" />
<ComponentRef Id="MainExecutable" /> <ComponentRef Id="MainExecutable" />
<ComponentRef Id="_bz2.pyd" />
<ComponentRef Id="_ctypes.pyd" />
<ComponentRef Id="_elementtree.pyd" />
<ComponentRef Id="_hashlib.pyd" />
<ComponentRef Id="_lzma.pyd" />
<ComponentRef Id="_queue.pyd" />
<ComponentRef Id="_socket.pyd" />
<ComponentRef Id="_sqlite3.pyd" />
<ComponentRef Id="_ssl.pyd" />
<ComponentRef Id="_tkinter.pyd" />
<ComponentRef Id="cacert.pem" /> <ComponentRef Id="cacert.pem" />
<ComponentRef Id="commodity.csv" /> <ComponentRef Id="commodity.csv" />
<ComponentRef Id="cs.strings" />
<ComponentRef Id="de.strings" />
<ComponentRef Id="EDMarketConnector.ico" /> <ComponentRef Id="EDMarketConnector.ico" />
<ComponentRef Id="EDMarketConnector.VisualElementsManifest.xml" /> <ComponentRef Id="EDMarketConnector.VisualElementsManifest.xml" />
<ComponentRef Id="EDMC.exe" /> <ComponentRef Id="EDMC.exe" />
<ComponentRef Id="EUROCAPS.TTF" /> <ComponentRef Id="EUROCAPS.TTF" />
<ComponentRef Id="library.zip" />
<ComponentRef Id="libcrypto_1_1.dll" />
<ComponentRef Id="libssl_1_1.dll" />
<ComponentRef Id="modules.p" />
<ComponentRef Id="pyexpat.pyd" />
<ComponentRef Id="python37.dll" />
<ComponentRef Id="rare_commodity.csv" />
<ComponentRef Id="select.pyd" />
<ComponentRef Id="ships.p" />
<ComponentRef Id="snd_bad.wav" />
<ComponentRef Id="snd_good.wav" />
<ComponentRef Id="stations.p" />
<ComponentRef Id="systems.p" />
<ComponentRef Id="tcl86t.dll" />
<ComponentRef Id="tk86t.dll" />
<ComponentRef Id="unicodedata.pyd" />
<ComponentRef Id="winsound.pyd" />
<ComponentRef Id="WinSparkle.dll" />
<ComponentRef Id="_bz2.pyd" />
<ComponentRef Id="_ctypes.pyd" />
<ComponentRef Id="_decimal.pyd" />
<ComponentRef Id="_elementtree.pyd" />
<ComponentRef Id="_hashlib.pyd" />
<ComponentRef Id="_lzma.pyd" />
<ComponentRef Id="_multiprocessing.pyd" />
<ComponentRef Id="_queue.pyd" />
<ComponentRef Id="_socket.pyd" />
<ComponentRef Id="sqlite3.dll" />
<ComponentRef Id="_sqlite3.pyd" />
<ComponentRef Id="_ssl.pyd" />
<ComponentRef Id="_testcapi.pyd" />
<ComponentRef Id="_tkinter.pyd" />
<ComponentRef Id="cs.strings" />
<ComponentRef Id="de.strings" />
<ComponentRef Id="es.strings" /> <ComponentRef Id="es.strings" />
<ComponentRef Id="fi.strings" /> <ComponentRef Id="fi.strings" />
<ComponentRef Id="fr.strings" /> <ComponentRef Id="fr.strings" />
<ComponentRef Id="hu.strings" /> <ComponentRef Id="hu.strings" />
<ComponentRef Id="it.strings" /> <ComponentRef Id="it.strings" />
<ComponentRef Id="ja.strings" /> <ComponentRef Id="ja.strings" />
<ComponentRef Id="libcrypto_1_1.dll" />
<ComponentRef Id="library.zip" />
<ComponentRef Id="libssl_1_1.dll" />
<ComponentRef Id="lv.strings" /> <ComponentRef Id="lv.strings" />
<ComponentRef Id="modules.p" />
<ComponentRef Id="nl.strings" /> <ComponentRef Id="nl.strings" />
<ComponentRef Id="pl.strings" /> <ComponentRef Id="pl.strings" />
<ComponentRef Id="pt_BR.strings" /> <ComponentRef Id="pt_BR.strings" />
<ComponentRef Id="pt_PT.strings" /> <ComponentRef Id="pt_PT.strings" />
<ComponentRef Id="pyexpat.pyd" />
<ComponentRef Id="python37.dll" />
<ComponentRef Id="rare_commodity.csv" />
<ComponentRef Id="ru.strings" /> <ComponentRef Id="ru.strings" />
<ComponentRef Id="select.pyd" />
<ComponentRef Id="ships.p" />
<ComponentRef Id="sr_Latn.strings" /> <ComponentRef Id="sr_Latn.strings" />
<ComponentRef Id="snd_good.wav" />
<ComponentRef Id="snd_bad.wav" />
<ComponentRef Id="sqlite3.dll" />
<ComponentRef Id="stations.p" />
<ComponentRef Id="systems.p" />
<ComponentRef Id="tcl86t.dll" />
<ComponentRef Id="tk86t.dll" />
<ComponentRef Id="uk.strings" /> <ComponentRef Id="uk.strings" />
<ComponentRef Id="zh_Hans.strings" /> <ComponentRef Id="unicodedata.pyd" />
<ComponentRef Id="winsound.pyd" />
<ComponentRef Id="WinSparkle.dll" />
<ComponentRef Id="zh_CN.strings" />
<ComponentRef Id="auto.tcl" /> <ComponentRef Id="auto.tcl" />
<ComponentRef Id="clock.tcl" /> <ComponentRef Id="clock.tcl" />
<ComponentRef Id="history.tcl" /> <ComponentRef Id="history.tcl" />
@ -601,21 +581,19 @@
<ComponentRef Id="package.tcl" /> <ComponentRef Id="package.tcl" />
<ComponentRef Id="parray.tcl" /> <ComponentRef Id="parray.tcl" />
<ComponentRef Id="safe.tcl" /> <ComponentRef Id="safe.tcl" />
<ComponentRef Id="tclIndex" /> <ComponentRef Id="tclIndex_1" />
<ComponentRef Id="tm.tcl" /> <ComponentRef Id="tm.tcl" />
<ComponentRef Id="word.tcl" /> <ComponentRef Id="word.tcl" />
<ComponentRef Id="http.tcl" />
<ComponentRef Id="pkgIndex.tcl" />
<ComponentRef Id="optparse.tcl" /> <ComponentRef Id="optparse.tcl" />
<ComponentRef Id="pkgIndex.tcl_1" /> <ComponentRef Id="pkgIndex.tcl_1" />
<ComponentRef Id="bgerror.tcl" /> <ComponentRef Id="bgerror.tcl" />
<ComponentRef Id="button.tcl" /> <ComponentRef Id="button.tcl_1" />
<ComponentRef Id="choosedir.tcl" /> <ComponentRef Id="choosedir.tcl" />
<ComponentRef Id="clrpick.tcl" /> <ComponentRef Id="clrpick.tcl" />
<ComponentRef Id="comdlg.tcl" /> <ComponentRef Id="comdlg.tcl" />
<ComponentRef Id="console.tcl" /> <ComponentRef Id="console.tcl" />
<ComponentRef Id="dialog.tcl" /> <ComponentRef Id="dialog.tcl" />
<ComponentRef Id="entry.tcl" /> <ComponentRef Id="entry.tcl_1" />
<ComponentRef Id="focus.tcl" /> <ComponentRef Id="focus.tcl" />
<ComponentRef Id="fontchooser.tcl" /> <ComponentRef Id="fontchooser.tcl" />
<ComponentRef Id="iconlist.tcl" /> <ComponentRef Id="iconlist.tcl" />
@ -629,13 +607,13 @@
<ComponentRef Id="obsolete.tcl" /> <ComponentRef Id="obsolete.tcl" />
<ComponentRef Id="optMenu.tcl" /> <ComponentRef Id="optMenu.tcl" />
<ComponentRef Id="palette.tcl" /> <ComponentRef Id="palette.tcl" />
<ComponentRef Id="panedwindow.tcl" /> <ComponentRef Id="panedwindow.tcl_1" />
<ComponentRef Id="pkgIndex.tcl_2" /> <ComponentRef Id="pkgIndex.tcl_2" />
<ComponentRef Id="safetk.tcl" /> <ComponentRef Id="safetk.tcl" />
<ComponentRef Id="scale.tcl" /> <ComponentRef Id="scale.tcl_1" />
<ComponentRef Id="scrlbar.tcl" /> <ComponentRef Id="scrlbar.tcl" />
<ComponentRef Id="spinbox.tcl" /> <ComponentRef Id="spinbox.tcl_1" />
<ComponentRef Id="tclIndex_1" /> <ComponentRef Id="tclIndex_2" />
<ComponentRef Id="tearoff.tcl" /> <ComponentRef Id="tearoff.tcl" />
<ComponentRef Id="text.tcl" /> <ComponentRef Id="text.tcl" />
<ComponentRef Id="tk.tcl" /> <ComponentRef Id="tk.tcl" />
@ -650,16 +628,16 @@
<ComponentRef Id="combobox.tcl" /> <ComponentRef Id="combobox.tcl" />
<ComponentRef Id="cursors.tcl" /> <ComponentRef Id="cursors.tcl" />
<ComponentRef Id="defaults.tcl" /> <ComponentRef Id="defaults.tcl" />
<ComponentRef Id="entry.tcl_1" /> <ComponentRef Id="entry.tcl_2" />
<ComponentRef Id="fonts.tcl" /> <ComponentRef Id="fonts.tcl" />
<ComponentRef Id="menubutton.tcl" /> <ComponentRef Id="menubutton.tcl" />
<ComponentRef Id="notebook.tcl" /> <ComponentRef Id="notebook.tcl" />
<ComponentRef Id="panedwindow.tcl_1" /> <ComponentRef Id="panedwindow.tcl_2" />
<ComponentRef Id="progress.tcl" /> <ComponentRef Id="progress.tcl" />
<ComponentRef Id="scale.tcl_1" /> <ComponentRef Id="scale.tcl_2" />
<ComponentRef Id="scrollbar.tcl" /> <ComponentRef Id="scrollbar.tcl" />
<ComponentRef Id="sizegrip.tcl" /> <ComponentRef Id="sizegrip.tcl" />
<ComponentRef Id="spinbox.tcl_1" /> <ComponentRef Id="spinbox.tcl_2" />
<ComponentRef Id="treeview.tcl" /> <ComponentRef Id="treeview.tcl" />
<ComponentRef Id="ttk.tcl" /> <ComponentRef Id="ttk.tcl" />
<ComponentRef Id="utils.tcl" /> <ComponentRef Id="utils.tcl" />

28
eddb.py
View File

@ -3,33 +3,18 @@
# build databases from files systems.csv and stations.json from http://eddb.io/api # build databases from files systems.csv and stations.json from http://eddb.io/api
# #
import argparse
import pickle import pickle
import csv import csv
import json import json
import requests import requests
def load_file(filename): def download(filename):
if filename == 'systems.csv' and args.systems_file: r = requests.get('https://eddb.io/archive/v6/' + filename, stream=True)
print('load_file: systems.csv from local file') print('\n%s\t%dK' % (filename, len(r.content) / 1024))
return open(args.systems_file, newline='') return r
elif filename == 'stations.json' and args.stations_file:
print('load_file: stations.json from local file')
stations = []
with open(args.stations_file) as jsonl_file:
for l in jsonl_file:
stations.append(json.loads(l))
return stations
else:
raise AssertionError('load_file called with unsupported filename')
if __name__ == "__main__": if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Utilises eddb.io data files to produce... FIXME')
parser.add_argument('-S', '--systems-file', help="Specify a local file copy of eddb.io's systems.csv")
parser.add_argument('-s', '--stations-file', help="Specify a local file copy of eddb.io's stations.json")
args = parser.parse_args()
# Ellipsoid that encompasses most of the systems in the bubble (but not outliers like Sothis) # Ellipsoid that encompasses most of the systems in the bubble (but not outliers like Sothis)
RX = RZ = 260 RX = RZ = 260
CY = -50 CY = -50
@ -61,7 +46,8 @@ if __name__ == "__main__":
'y' : float(s['y']), 'y' : float(s['y']),
'z' : float(s['z']), 'z' : float(s['z']),
'is_populated' : int(s['is_populated']), 'is_populated' : int(s['is_populated']),
} for s in csv.DictReader(load_file('systems.csv')) } } for s in csv.DictReader(download('systems.csv').iter_lines(decode_unicode=True)) }
#} for s in csv.DictReader(open('systems.csv')) }
print('%d\tsystems' % len(systems)) print('%d\tsystems' % len(systems))
# Build another dict containing all systems considered to be in the # Build another dict containing all systems considered to be in the
@ -130,7 +116,7 @@ if __name__ == "__main__":
print('\n%d saved systems' % len(system_ids)) print('\n%d saved systems' % len(system_ids))
# station_id by (system_id, station_name) # station_id by (system_id, station_name)
stations = load_file('stations.json') stations = json.loads(download('stations.json').content) # let json do the utf-8 decode
station_ids = { station_ids = {
(x['system_id'], x['name']) : x['id'] # Pilgrim's Ruin in HR 3005 id 70972 has U+2019 quote (x['system_id'], x['name']) : x['id'] # Pilgrim's Ruin in HR 3005 id 70972 has U+2019 quote
for x in stations if x['max_landing_pad_size'] for x in stations if x['max_landing_pad_size']

6
outfitting.py
View File

@ -464,12 +464,8 @@ def lookup(module, ship_map, entitled=False):
(new['class'], new['rating']) = (str(name[2][4:]), 'A') (new['class'], new['rating']) = (str(name[2][4:]), 'A')
elif len(name) < 4 and name[1] in ['guardianfsdbooster']: # Hack! No class. elif len(name) < 4 and name[1] in ['guardianfsdbooster']: # Hack! No class.
(new['class'], new['rating']) = (str(name[2][4:]), 'H') (new['class'], new['rating']) = (str(name[2][4:]), 'H')
elif len(name) < 4 and name[0] == 'dronecontrol' and name[1] == 'resourcesiphon':
# 128066402,Int_DroneControl_ResourceSiphon,internal,Limpet Control,,,,1,I,
(new['class'], new['rating']) = (1, 'I')
else: else:
if len(name) < 3: if len(name) < 3: raise AssertionError('%s: length < 3]' % (name))
raise AssertionError('%s: length < 3]' % (name))
if not name[2].startswith('size') or not name[3].startswith('class'): raise AssertionError('%s: Unknown class/rating "%s/%s"' % (module['id'], name[2], name[3])) if not name[2].startswith('size') or not name[3].startswith('class'): raise AssertionError('%s: Unknown class/rating "%s/%s"' % (module['id'], name[2], name[3]))
new['class'] = str(name[2][4:]) new['class'] = str(name[2][4:])
new['rating'] = (name[1]=='buggybay' and planet_rating_map or new['rating'] = (name[1]=='buggybay' and planet_rating_map or

12
setup.py
View File

@ -8,14 +8,13 @@ Usage:
""" """
from distutils.core import setup from distutils.core import setup
import py2exe import codecs
import platform
import sys
import os import os
from os.path import exists, isdir, join from os.path import exists, isdir, join
import shutil import platform
import re import re
import shutil
import sys
from tempfile import gettempdir from tempfile import gettempdir
from config import appname as APPNAME, applongname as APPLONGNAME, appcmdname as APPCMDNAME, appversion as VERSION from config import appname as APPNAME, applongname as APPLONGNAME, appcmdname as APPCMDNAME, appversion as VERSION
@ -147,6 +146,8 @@ elif sys.platform=='win32':
setup( setup(
name = APPLONGNAME, name = APPLONGNAME,
version = VERSION,
app = [APP],
windows = [ {'dest_base': APPNAME, windows = [ {'dest_base': APPNAME,
'script': APP, 'script': APP,
'icon_resources': [(0, '%s.ico' % APPNAME)], 'icon_resources': [(0, '%s.ico' % APPNAME)],
@ -165,6 +166,7 @@ setup(
} ], } ],
data_files = DATA_FILES, data_files = DATA_FILES,
options = OPTIONS, options = OPTIONS,
setup_requires = [sys.platform=='darwin' and 'py2app' or 'py2exe'],
) )
PKG = None PKG = None