Jonathan Harris
68ec5fe0e1
Sync coriolis-data
2020-06-21 16:28:29 +01:00
Athanasius
f21729ceb4
exe: Cull lib/tcl/tzdata from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
b19a54f980
exe: cull lib/tk/msgs/ from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
d2d960c5d3
exe: Cull lib/tk/images/ from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
85b82f46d7
exe: Cull lib/tk/demos/ from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
25b9470b58
exe: Culls lib/tcl/msgs/ from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
f41cb3e295
exe: Culls all lib/tcl/encoding from .wxs
2020-06-21 16:28:29 +01:00
Athanasius
091a7c22d5
Revert "Lowers companion.py holdoff to 10 seconds"
...
This reverts commit 93c4f85b3c4c25216ec5f5f62754671b9d8d04e2.
2020-06-21 16:28:29 +01:00
Athanasius
5560cb9ec6
exe: Updating setup.py with minimal changes to work under py2exe 0.9.3.2
2020-06-21 16:28:09 +01:00
Athanasius
1f1946f80d
Force inclusion of sqlite3.dll
...
*) There's a bug in py2exe meaning sqlite3.dll doesn't get pulled in
by listing it in packages. So we fudge it, assuming it's in
<sys.base_prefix>/DLLs/sqlite3.dll (which is the case for Python 3.2
32-bit on Windows).
Bug report filed:
<https://github.com/albertosottile/py2exe/issues/23 >
*) Adds sqlite3.dll back into .wxs file
2020-06-21 16:24:15 +01:00
Athanasius
b8d60cf2ac
exe: Restore library.zip to .wxs
...
I'd only removed this due to accidentally using "zipfile=None" in the
setup.py previously. So of course I had no library.zip and took it out
of .wxs to suppress file not found errors.
But without this python won't find the necessary files.
2020-06-21 16:24:15 +01:00
Athanasius
9d3ec547e2
exe: Fixes <Feature><ComponentRef ...> where GUID is explicit
2020-06-21 16:24:15 +01:00
Athanasius
4d45646c15
exe: Successful .msi build!
...
*) .wxs <Feature> updated to match the defined Components
*) That exit() removed from cp37-setup.py so the WiX build runs
2020-06-21 16:24:15 +01:00
Athanasius
05269edf49
exe: Correct .wxs GUIDs.
...
1) Those with specific GUIDs only have them for historical reasons.
2) They need to keep the same GUID, else the installer will be
unhappy.
3) New files should use "*" for a path-based GUID.
2020-06-21 16:23:02 +01:00
Athanasius
c8f732f7a2
exe: We don't need to explicitly set REQUESTS_CA_BUNDLE any more.
2020-06-21 16:23:02 +01:00
Athanasius
937cd990c6
exe: Removes the previous un-setting of TCL_LIBRARY
...
This is what was causing py2exe 0.9.3.2's fix for 'import tkinter' to
then fail on .exe run due to unset TCL_LIBRARY.
2020-06-21 16:23:02 +01:00
Athanasius
0dbe901158
exe: l10n.py removal of un-needed .decode() calls
2020-06-21 16:23:02 +01:00
Athanasius
dded0196ea
exe: config.py doesn't need to decode() any more
2020-06-21 16:23:01 +01:00
Athanasius
7449f5fb3b
Adjusts subprocess call to work on Windows and Mac.
2020-06-21 16:23:01 +01:00
Athanasius
5c9dbe240a
Updated coriolis data files
2020-06-21 16:23:01 +01:00
Athanasius
19dcf9648a
Updated eddb.py & output files after a full run.
2020-06-21 16:23:01 +01:00
Athanasius
0da9667cdb
collate.py can be run stand-alone, update to 'env'-based first line
2020-06-21 16:23:01 +01:00
Athanasius
5beac17553
Fixes another binary versus string issue in collate.py
2020-06-21 16:23:01 +01:00
Athanasius
27d7265c86
Cleanup of EDMC.py and related code. All flags tested.
...
Mostly the usual file-mode versus .encode('utf-8') tweaks, but also
one list() needed around a <dict>.values().
2020-06-21 16:23:01 +01:00
Athanasius
69bcb9d6fa
EDMC.py: Small fix to exception handling.
...
Now stymied on further work due to game patch today and CAPI being
down.
2020-06-21 16:23:01 +01:00
Athanasius
ddf2babaaa
Fixes up "EDMC.py -j" for python3
2020-06-21 16:23:01 +01:00
Athanasius
67708fd090
Initial work on getting the EDMC.py CLI to work under python3
...
*) Fix up print usage
*) cPickle -> cpickle
*) "EDMC.py -p <cmdr name>" appears to have never been properly
updated for multi-account support.
2020-06-21 16:23:01 +01:00
Athanasius
a8c0ec3ab9
Updates prefs.py for "import tkinter.filedialog"
2020-06-21 16:23:01 +01:00
Athanasius
2440cf4a67
platform is always just 'linux' under python3
2020-06-21 16:23:01 +01:00
Athanasius
71e5f10457
Minor cleanup.
2020-06-21 16:23:01 +01:00
Athanasius
78073790df
update.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
6ff9dbc3bf
plugins/edsy.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
02bcbf2685
plugins/eddb.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
725cf6f1e8
Need to int() a division if passing where an int is required
2020-06-21 16:23:01 +01:00
Athanasius
074cf8a119
Updates generation of ships.p and modules.p
...
In doing so also fixes up outfitting.py for Int_DroneControl_ResourceSiphon
2020-06-21 16:23:01 +01:00
Athanasius
2c26216e13
dashboard.py: Missed de-future'ing old_div
2020-06-21 16:23:01 +01:00
Athanasius
6925abf93b
theme.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
3900e3e4ab
protocol.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
4a7f4cd450
plugins/inara.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
35867cd3f9
plugins/edsm.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
93a65b02f5
plugins/eddn.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
143d6e717a
plugins/eddn.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
cc30f8e913
monitor.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
5a4f47be8b
l10n.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
40a0c09f6d
config.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
5783ce7ea0
dashboard.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
d4a263aab1
companion.py: De-future
2020-06-21 16:23:01 +01:00
Athanasius
6adb64913e
Revert "Switches to .format() for startup code."
...
This reverts commit 11194c1374e4e325b523e6a348503dd0bc0d1a6b.
2020-06-21 16:23:00 +01:00
Athanasius
83e925325e
EDMarketConnector.py: De-future
2020-06-21 16:23:00 +01:00
Athanasius
868a294b6b
Switches to .format() for startup code.
2020-06-21 16:23:00 +01:00
