diff --git a/ChangeLog.md b/ChangeLog.md index 35c6cd5c..fe7c4792 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,65 +1,15 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in reverse chronological order (latest first). --- -Pre-Release 4.2.0-beta3 +Release 4.2.0 === -* Allow `--force-localserver-for-auth` to actually work. See [#891 - `--force-localserver-for-auth` fails due to JounalLock being imported from - monitor.py](https://github.com/EDCD/EDMarketConnector/issues/891) +*This release increases the Minor version due to the major change in how +multiple-instance checking is done.* -Pre-Release 4.2.0-beta2 -=== - -This release actually includes the commits to enable Steam and Epic -authentication. - -**NB: The correct form for the runas command is as follows:** - -`runas /user: "\"c:\Program Files (x86)\EDMarketConnector\EDMarketConnector.exe\" --force-localserver-for-auth"` - -If anything has messed with the backslash characters there then know that you -need to have " (double-quote) around the entire command (path to program .exe -*and* any extra arguments), and as a result need to place a backslash before -any double-quote characters in the command (such as around the space-including -path to the program). - -I've verified it renders correctly [on GitHub](https://github.com/EDCD/EDMarketConnector/blob/Release/4.2.0-beta2/ChangeLog.md). - -Pre-Release 4.2.0-beta1 -=== - -*NB: This contains further work on top of 4.1.7-rc1. Due to the major change -in how multiple-instance checking is done we felt the need to bump the minor -version.* - -There is a major change in this release with respect to how the main -application checks if there is already another instance running. - -For most users things will operate no differently, although note that the -multiple instance check does now apply to platforms other than Windows. - -For anyone wanting to run multiple instances of the program this is now -possible via: - -`runas /user:OTHERUSER EDMarketConnector.exe --force-localserver-for-auth` - -The old check was based solely on there being a window present with the title -we expect. This prevented using `runas /user:SOMEUSER ...` to run a second -copy of the application, as the resulting window would still be within the -same desktop environment and thus be found in the check. - -The new method does assume that the Journals directory is writable by the -user we're running as. This might not be true in the case of sharing the -file system to another host in a read-only manner. If we fail to open the -lock file read-write then the application aborts the checks and will simply -continue running as normal. - -Note that any single instance of EDMarketConnector.exe will still only monitor -and act upon the *latest* Journal file in the configured location. If you run -Elite Dangerous for another Commander then the application will want to start -monitoring that separate Commander. See [wiki:Troubleshooting#i-run-two-instances-of-ed-simultaneously-but-i-cant-run-two-instances-of-edmc](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#i-run-two-instances-of-ed-simultaneously-but-i-cant-run-two-instances-of-edmc>) -which will be updated when this change is in a full release. +* Adds Steam and Epic to the list of "audiences" in the Frontier Auth callout + so that you can authorise using those accounts, rather than their associated + Frontier Account details. * Changes the "is there another process already running?" check to be based on a lockfile in the configured Journals directory. The name of this file is @@ -73,17 +23,46 @@ which will be updated when this change is in a full release. The lock will be released and applied to the new directory if you change it via Settings > Configuration. If the new location is already locked you'll get a 'Retry/Ignore?' pop-up. - + + For most users things will operate no differently, although note that the + multiple instance check does now apply to platforms other than Windows. + + For anyone wanting to run multiple instances of the program this is now + possible via: + + `runas /user: "\"c:\Program Files (x86)\EDMarketConnector\EDMarketConnector.exe\" --force-localserver-for-auth"` + + If anything has messed with the backslash characters there then know that you + need to have " (double-quote) around the entire command (path to program .exe + *and* any extra arguments), and as a result need to place a backslash before + any double-quote characters in the command (such as around the space-including + path to the program). + + I've verified it renders correctly [on GitHub](https://github.com/EDCD/EDMarketConnector/blob/Release/4.2.0/ChangeLog.md). + + The old check was based solely on there being a window present with the title + we expect. This prevented using `runas /user:SOMEUSER ...` to run a second + copy of the application, as the resulting window would still be within the + same desktop environment and thus be found in the check. + + The new method does assume that the Journals directory is writable by the + user we're running as. This might not be true in the case of sharing the + file system to another host in a read-only manner. If we fail to open the + lock file read-write then the application aborts the checks and will simply + continue running as normal. + + Note that any single instance of EDMarketConnector.exe will still only monitor + and act upon the *latest* Journal file in the configured location. If you run + Elite Dangerous for another Commander then the application will want to start + monitoring that separate Commander. See [wiki:Troubleshooting#i-run-two-instances-of-ed-simultaneously-but-i-cant-run-two-instances-of-edmc](https://github.com/EDCD/EDMarketConnector/wiki/Troubleshooting#i-run-two-instances-of-ed-simultaneously-but-i-cant-run-two-instances-of-edmc>) + which will be updated when this change is in a full release. + * Adds the command-line argument `--force-localserver-for-auth`. This forces using a local webserver for the Frontier Auth callback. This should be used when running multiple instances of the application **for all instances** else there's no guarantee of the `edmc://` protocol callback reaching the correct process and Frontier Auth will fail. -* Adds Steam and Epic to the list of "audiences" in the Frontier Auth callout - so that you can authorise using those accounts, rather than their associated - Frontier Account details. - * Adds the command-line argument `--suppress-dupe-process-popup` to exit without showing the warning popup in the case that EDMarketConnector found another process already running. @@ -92,6 +71,7 @@ which will be updated when this change is in a full release. batch file or similar. + Release 4.1.6 === diff --git a/config.py b/config.py index bf9d4fee..0f2144bb 100644 --- a/config.py +++ b/config.py @@ -13,7 +13,7 @@ appcmdname = 'EDMC' # appversion **MUST** follow Semantic Versioning rules: # # Major.Minor.Patch(-prerelease)(+buildmetadata) -appversion = '4.2.0-beta3' #-rc1+a872b5f' +appversion = '4.2.0' #-rc1+a872b5f' # For some things we want appversion without (possible) +build metadata appversion_nobuild = str(semantic_version.Version(appversion).truncate('prerelease')) copyright = u'© 2015-2019 Jonathan Harris, 2020 EDCD'