Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade and replace web server with EmbedIO #216

Merged
merged 33 commits into from
Jul 25, 2020
Merged

Upgrade and replace web server with EmbedIO #216

merged 33 commits into from
Jul 25, 2020

Conversation

YoRyan
Copy link
Member

@YoRyan YoRyan commented Jun 13, 2020 •
edited

Successor to #202.

Replace the home-rolled web server with EmbedIO, separate and clean up the client webpages, and add a copy web content step to the build process. Also see these changes by Chris Jakeman.

Blueprints:
Foundation for interactive content on secondary screens/devices
Use EmbedIO in place of in-house web-server
Organise web content

YoRyan and others added 17 commits May 22, 2020 17:04
@YoRyan
Replace custom web server with EmbedIO.
ab45ba7
@YoRyan
Replace custom web server with EmbedIO.
1f4ba5a
@YoRyan
Make the web server also listen on [::1] and localhost.
3fc0938
@cjakemanMB
added packages.config to require EmbedIO and System.ValueTuple
ffe4b10
@cjakemanMB
merged to include localhost
acb1f4b
@cjakemanMB
re-organised the web content
91b97f2
@cjakemanRY
removed temporary file
dcb9a21
@YoRyan
Merge branch 'webserver2-jakeman' into webserver2
aafeb44
@YoRyan
Small style changes in web server code.
b060db5
@YoRyan
Add web server documentation to the manual.
84c9335
@YoRyan
Update web server manual section.
7d85995
@YoRyan
Style changes in web server API functions.
c41a31e
@YoRyan
Merge branch 'master' into webserver2
9d53cc2
@YoRyan
Reactivate Swan Lite NuGet package, which is required by EmbedIO.
b9ef462
@YoRyan
Restore NuGet packages before the AppVeyor build.
5c058a9
@YoRyan
Revert "Restore NuGet packages before the AppVeyor build."
9e44bfe 
This reverts commit 5c058a9.
@YoRyan
Restore NuGet packages during the build process.
0900b5a
@YoRyan YoRyan mentioned this pull request Jun 13, 2020
Closed
@cjakeman cjakeman added the for-unstable Special label to include a pull request in the Unstable Version label Jun 13, 2020
twpol pushed a commit that referenced this pull request Jun 13, 2020
@openrails-bot
Automatic merge of X1.3.1-170-g882947aa6 and 12 pull requests
9632cb0 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #183 at e6c01f7: restored BNSF Scenic Route and updated link to Broad Gauge Productions
- Pull request #188 at cdece3b: Setting.IsModeActivity added so Menu remembers choice of activity or …
- Pull request #205 at 873bc47: Traction-braking cabview control considering also train brake
- Pull request #206 at f677478: Add additional sound triggers for steam locomotives
- Pull request #207 at a3889ab: Correct an issue with throttle not increasing
- Pull request #208 at 1468587: Bug fix for https://bugs.launchpad.net/or/+bug/1882499 OR requires first number > 1 in animation ( 1 1
- Pull request #209 at 032225e: Enable rotation of digital clock cab control; by Paolo
- Pull request #211 at 32b48ad: Update of and improvements to German locales of RunActivity PLUS first version of Russian locales by Weter
- Pull request #212 at 9886b63: Bug fix for https://bugs.launchpad.net/or/+bug/1882397. Consist engine info shows bad.…
- Pull request #216 at 0900b5a: Upgrade and replace web server with EmbedIO (v2)
twpol pushed a commit that referenced this pull request Jun 13, 2020
@openrails-bot
Automatic merge of X1.3.1-170-g882947aa6 and 13 pull requests
b3e1f5d 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #183 at e6c01f7: restored BNSF Scenic Route and updated link to Broad Gauge Productions
- Pull request #188 at cdece3b: Setting.IsModeActivity added so Menu remembers choice of activity or …
- Pull request #205 at 873bc47: Traction-braking cabview control considering also train brake
- Pull request #206 at f677478: Add additional sound triggers for steam locomotives
- Pull request #207 at a3889ab: Correct an issue with throttle not increasing
- Pull request #208 at 1468587: Bug fix for https://bugs.launchpad.net/or/+bug/1882499 OR requires first number > 1 in animation ( 1 1
- Pull request #209 at 032225e: Enable rotation of digital clock cab control; by Paolo
- Pull request #211 at 32b48ad: Update of and improvements to German locales of RunActivity PLUS first version of Russian locales by Weter
- Pull request #212 at 9886b63: Bug fix for https://bugs.launchpad.net/or/+bug/1882397. Consist engine info shows bad.…
- Pull request #214 at 4c9606f: Fix annoying startup exception when running with a debugger attached
- Pull request #216 at 0900b5a: Upgrade and replace web server with EmbedIO (v2)
twpol pushed a commit that referenced this pull request Jun 13, 2020
@openrails-bot
Automatic merge of X1.3.1-171-gf756bf8ee and 13 pull requests
6f85432 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #183 at e6c01f7: restored BNSF Scenic Route and updated link to Broad Gauge Productions
- Pull request #188 at cdece3b: Setting.IsModeActivity added so Menu remembers choice of activity or …
- Pull request #205 at 873bc47: Traction-braking cabview control considering also train brake
- Pull request #207 at a3889ab: Correct an issue with throttle not increasing
- Pull request #208 at 1468587: Bug fix for https://bugs.launchpad.net/or/+bug/1882499 OR requires first number > 1 in animation ( 1 1
- Pull request #209 at 032225e: Enable rotation of digital clock cab control; by Paolo
- Pull request #211 at 32b48ad: Update of and improvements to German locales of RunActivity PLUS first version of Russian locales by Weter
- Pull request #212 at 9886b63: Bug fix for https://bugs.launchpad.net/or/+bug/1882397. Consist engine info shows bad.…
- Pull request #214 at 4c9606f: Fix annoying startup exception when running with a debugger attached
- Pull request #216 at 0900b5a: Upgrade and replace web server with EmbedIO (v2)
- Pull request #217 at aae4d79: Additional Sound Triggers for steam locomotives
@cjakeman
Copy link
Contributor

Jenkins build reports:
WARNING: nuget.exe ([UTS] .NET package manager tool) is not found in %PATH% - the build may fail.
ERROR: Input redirection is not supported, exiting the process immediately.
'nuget' is not recognized as an internal or external command,
operable program or batch file.
ERROR: Failure during build (check the output above). Error 1.
Build step 'Execute Windows batch command' marked build as failure

so this method is not working. I'm closing the PR until we have an alternative, so the Jenkins build can continue.

Chris

@cjakeman cjakeman closed this Jun 14, 2020
@cjakeman
Copy link
Contributor

nuget.exe has been added to Jenkins, so I'm going to open this PR and try building again.

@cjakeman cjakeman reopened this Jun 16, 2020
twpol pushed a commit that referenced this pull request Jun 16, 2020
@openrails-bot
Automatic merge of X1.3.1-183-g88c3b4b91 and 4 pull requests
d53fb4e 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #214 at 2b62097: Fix annoying startup exception when running with a debugger attached
- Pull request #216 at cf45322: Upgrade and replace web server with EmbedIO (v2)
cjakeman
cjakeman reviewed Jun 16, 2020
View reviewed changes
Copy link
Contributor

@cjakeman cjakeman left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have to resolve some conflicts manually, but Jenkins has now successfully included this in the Unstable build.
Hope it still works !
Chris

EDIT By Chris: Yes, it does work.

twpol pushed a commit that referenced this pull request Jul 15, 2020
@openrails-bot
Automatic merge of X1.3.1-191-g55d874aac and 9 pull requests
8f9fafd 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #221 at 13ba17f: Refactor try-catch blocks in RunActivity
- Pull request #225 at bb67fb6: Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
twpol pushed a commit that referenced this pull request Jul 20, 2020
@openrails-bot
Automatic merge of X1.3.1-193-gdea924482 and 8 pull requests
f98b206 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 377e893: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
twpol pushed a commit that referenced this pull request Jul 21, 2020
@openrails-bot
Automatic merge of X1.3.1-193-gdea924482 and 9 pull requests
ee8de79 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #145 at c024d04: Advanced Coupler Functionality
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 377e893: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
twpol pushed a commit that referenced this pull request Jul 22, 2020
@openrails-bot
Automatic merge of X1.3.1-194-g1e6e4b5f4 and 9 pull requests
63d9c32 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 377e893: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
- Pull request #234 at e3c545c: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 22, 2020
@openrails-bot
Automatic merge of X1.3.1-194-g1e6e4b5f4 and 9 pull requests
619b9f2 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 377e893: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 22, 2020
@openrails-bot
Automatic merge of X1.3.1-194-g1e6e4b5f4 and 9 pull requests
818c117 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 6b464fb: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #233 at 4084c75: Remove startup exception in the launcher by refactoring a try-catch
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
8675289 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at b74ea65: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
d7b6429 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 2ba1d2c: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 9b12015: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
4a032d5 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 9b12015: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
5926798 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 9b12015: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
@wjcurrey wjcurrey assigned wjcurrey and unassigned wjcurrey Jul 23, 2020
@wjcurrey wjcurrey self-requested a review July 23, 2020 19:37
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
c2268c8 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 9b12015: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at bca1702: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
dda6b3e 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 25dbdea: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at bca1702: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
8ae5173 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at da3c574: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
fc1bd02 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 0b66e51: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 23, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
40d1191 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at d189ea9: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 24, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
24fa173 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 03dc5dd: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
twpol pushed a commit that referenced this pull request Jul 24, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
649cc5c 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 633793b: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
@cjakeman cjakeman removed the request for review from twpol July 24, 2020 12:12
twpol pushed a commit that referenced this pull request Jul 24, 2020
@openrails-bot
Automatic merge of X1.3.1-195-g6502efe3d and 8 pull requests
cc5a388 
- Pull request #40 at e81861b: Monogame upgrade
- Pull request #79 at 7d9f14b: Update version calculation for new unstable versions
- Pull request #216 at 927a49c: Upgrade and replace web server with EmbedIO
- Pull request #226 at 26983e9: EmbedIO web server graphical track monitor
- Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor
- Pull request #228 at 72c0146: adds links to OR on Elvas Tower
- Pull request #232 at 699c09a: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor
- Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2
wjcurrey
wjcurrey approved these changes Jul 25, 2020
View reviewed changes
Copy link
Contributor

@wjcurrey wjcurrey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am approving these changes. Per a PM discussion with Ryan, and anticipating that external devices would be enabled in the future. This should allow other WebServer changes to proceed

@wjcurrey wjcurrey self-requested a review July 25, 2020 03:59
@wjcurrey wjcurrey merged commit 253eec2 into openrails:master Jul 25, 2020
@YoRyan YoRyan deleted the webserver2 branch July 25, 2020 18:17
@YoRyan YoRyan mentioned this pull request Jul 25, 2020
Merged
twpol
twpol reviewed Jul 31, 2020
View reviewed changes
Copy link
Member

@twpol twpol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me, although I have not reviewed the web content as my professional experience is going to make that painful :)

Build.cmd
@@ -137,6 +141,11 @@ editbin /NOLOGO /LARGEADDRESSAWARE "Program\RunActivityLAA.exe" || GOTO :error
copy "Program\RunActivity.exe.config" "Program\RunActivityLAA.exe.config" || GOTO :error
ECHO Created large address aware version of RunActivity.exe.

REM Copy the Web content, empty the destination folder first
IF EXIST "Program\Content\Web" RMDIR "Program\Content\Web" /S /Q
IF NOT EXIST "Program\Content\Web" MKDIR "Program\Content\Web"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The utility ":recreate" should do these two steps for you, e.g.

CALL :recreate "Program\Content\Web" || GOTO :error

However, because the entire Program directory is recreated earlier on line 102/106, this whole bit is not needed.

Source/RunActivity/RunActivity.csproj
<Content Include="Viewer3D\WebServices\Web\js\trackmonitor.js" />
<Content Include="Viewer3D\WebServices\Web\or_logo.png" />
<Content Include="Viewer3D\WebServices\Web\TrackMonitor\index.html" />
<Content Include="Viewer3D\WebServices\Web\TrackMonitor\index.js" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these references needed? I am confused by having these references and the XCOPY for the same directories, but maybe I'm missing something?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cjakeman

twpol pushed a commit to openrails/openrails.org that referenced this pull request Oct 31, 2020
@wjcurrey
Merge pull request openrails/openrails#216 from YoRyan/webserver2
79c2d94 
Upgrade and replace web server with EmbedIO
@twpol twpol added the refactoring Changes with minimal user-visible effects label Sep 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twpol twpol twpol left review comments

@cjakeman cjakeman cjakeman left review comments

@wjcurrey wjcurrey Awaiting requested review from wjcurrey

Assignees
No one assigned
Labels
for-unstable Special label to include a pull request in the Unstable Version refactoring Changes with minimal user-visible effects
Milestone
No milestone
6 participants
@YoRyan @cjakeman @twpol @wjcurrey @cjakemanMB @cjakemanRY