Reorganize root files

.gitignore

@@ -13,3 +13,4 @@ packages/*
 *.user
 *.dmb
 *.int
+/html

.travis.yml

@@ -5,7 +5,7 @@ env:
     global:
     - BYOND_MAJOR="511"
     - BYOND_MINOR="1385"
-    - DMEName="DMAPITravisTester.dme"
+    - DMEName="Tools/DMAPITravisTester.dme"
 
 cache:
   directories:
@@ -18,7 +18,7 @@ addons:
       - libstdc++6:i386
 
 install:
-    - ./install_byond.sh
+    - ./Tools/install_byond.sh
 
 script:
-    - ./build_byond.sh
+    - ./Tools/build_byond.sh

DMAPITravisTester.dme

@@ -1,21 +0,0 @@
-// DM Environment file for DMAPITravisTester.dme.
-// All manual changes should be made outside the BEGIN_ and END_ blocks.
-// New source code should be placed in .dm files: choose File/New --> Code File.
-
-// BEGIN_INTERNALS
-// END_INTERNALS
-
-// BEGIN_FILE_DIR
-#define FILE_DIR .
-// END_FILE_DIR
-
-// BEGIN_PREFERENCES
-// END_PREFERENCES
-
-// BEGIN_INCLUDE
-#include "Config.dm"
-#include "DMAPI\server_tools.dm"
-#include "DMAPI\st_commands.dm"
-#include "DMAPI\st_interface.dm"
-#include "Test.dm"
-// END_INCLUDE

README.md

@@ -16,7 +16,7 @@ Requires python 2.7/3.6 to be installed for changelog generation
 
 ## Installing (GUI):
 1. Launch TGControlPanel.exe as an administrator. A shortcut can be found on your desktop
-1. Optionally switch to the `Server` tab and change the Server Path location from C:\tgstation-server-3 to wherever you wish
+1. Optionally switch to the `Server` tab and change the Server Path location from C:\\tgstation-server-3 to wherever you wish
 1. Go to the `Repository` Tab and set the remote address and branch of the git you with to track
 1. Hit the clone button
 1. While waiting go to the BYOND tab and install the BYOND version you wish

TGStationServer3.sln

@@ -18,17 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		.travis.yml = .travis.yml
 		appveyor.yml = appveyor.yml
-		build_byond.sh = build_byond.sh
-		Config.dm = Config.dm
-		DMAPITravisTester.dme = DMAPITravisTester.dme
-		Doxyfile = Doxyfile
-		install_byond.sh = install_byond.sh
 		README.md = README.md
-		Test.dm = Test.dm
 		tgs.ico = tgs.ico
-		TGS3Build.ps1 = TGS3Build.ps1
 		Version.cs = Version.cs
-		View TGS3 Logs.xml = View TGS3 Logs.xml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TGInstallerWrapper", "TGInstallerWrapper\TGInstallerWrapper.csproj", "{8956D4C3-BFB9-448E-BF5F-EE7E6F9996F9}"
@@ -78,6 +70,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DMAPI", "DMAPI", "{9032B448
 		TGS3.json = TGS3.json
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{081BB0BB-2E84-47D4-9419-A2AB8E814ABF}"
+	ProjectSection(SolutionItems) = preProject
+		Tools\build_byond.sh = Tools\build_byond.sh
+		Tools\Config.dm = Tools\Config.dm
+		Tools\DMAPITravisTester.dme = Tools\DMAPITravisTester.dme
+		Tools\Doxyfile = Tools\Doxyfile
+		Tools\install_byond.sh = Tools\install_byond.sh
+		Tools\Test.dm = Tools\Test.dm
+		Tools\TGS3Build.ps1 = Tools\TGS3Build.ps1
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86

Tools/DMAPITravisTester.dme

@@ -0,0 +1,19 @@
+// Hand crafted DME, will not work if saved with DreamMaker
+
+// BEGIN_INTERNALS
+// END_INTERNALS
+
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+// END_FILE_DIR
+
+// BEGIN_PREFERENCES
+// END_PREFERENCES
+
+// BEGIN_INCLUDE
+#include "Config.dm"
+#include "..\DMAPI\server_tools.dm"
+#include "..\DMAPI\st_commands.dm"
+#include "..\DMAPI\st_interface.dm"
+#include "Test.dm"
+// END_INCLUDE

Tools/Test.dm

@@ -1,7 +1,3 @@
-#ifndef SERVER_TOOLS_ON_NEW
-#error DreamMaker rearranges the intentionally weird file layout of this project. Compile using dm.exe instead
-#endif
-
 /world/New()
 	SERVER_TOOLS_ON_NEW
 	world.log << "Service API Version: [SERVER_TOOLS_API_VERSION]"

appveyor.yml

@@ -25,7 +25,7 @@ build:
   parallel: true
   verbosity: minimal
 after_build:
-  - ps: .\TGS3Build.ps1
+  - ps: .\Tools\TGS3Build.ps1
   - ps: if($env:APPVEYOR_REPO_COMMIT_MESSAGE -match "\[TGSDeploy\]"){$env:TGSDeploy = "Do it."}
   - ps: $env:TGSVersion = [System.Diagnostics.FileVersionInfo]::GetVersionInfo("$env:APPVEYOR_BUILD_FOLDER/TGServerService/bin/x86/Release/TGServerService.exe").FileVersion
 deploy:
@@ -38,5 +38,3 @@ deploy:
   draft: false
   on:
     TGSDeploy: "Do it."
-on_finish:
-  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))