chore: move tools to src/tools

.github/CODEOWNERS

@@ -2,6 +2,6 @@
 
 /src/cordova/plugin/  @Jigsaw-Code/outline-networking-owners
 /third_party/         @Jigsaw-Code/outline-networking-owners
-/tools/               @Jigsaw-Code/outline-networking-owners
+/src/tools/               @Jigsaw-Code/outline-networking-owners
 
 /src/www/model/           @fortuna 

.github/workflows/build_and_test_debug.yml

@@ -213,7 +213,7 @@ jobs:
           java-version: 11
 
       - name: Setup Android
-        run: bash ./tools/build/setup_linux_android.sh
+        run: bash ./src/tools/build/setup_linux_android.sh
 
       - name: Build Android Client
         run: npm run action cordova/build android -- --verbose

.gitignore

@@ -14,11 +14,11 @@ xcuserdata/
 obj/
 packages/
 *.pdb
-tools/OutlineService/OutlineService/bin/*
-!tools/OutlineService/OutlineService/bin/*.exe
+src/tools/OutlineService/OutlineService/bin/*
+!src/tools/OutlineService/OutlineService/bin/*.exe
 *.sw?
-tools/smartdnsblock/bin/*
-!tools/smartdnsblock/bin/*.exe
+src/tools/smartdnsblock/bin/*
+!src/tools/smartdnsblock/bin/*.exe
 keystore.p12
 Outline.apk
 Outline.apks

.prettierignore

@@ -3,5 +3,5 @@ apple/
 docs/
 src/resources/
 third_party/
-tools/
+src/tools/
 node_modules/

src/cordova/android/README.md

@@ -6,7 +6,7 @@ The main entrypoint to Android's Java code is `cordova-plugin-outline/android/ja
 
 ## Building the Android app
 
-> 💡 NOTE: To easiest way to get set up for Android on a new environment is to use `tools/build/setup_macos_android.sh` or `tools/build/setup_linux_android.sh`.
+> 💡 NOTE: To easiest way to get set up for Android on a new environment is to use `src/tools/build/setup_macos_android.sh` or `src/tools/build/setup_linux_android.sh`.
 
 Additional requirements for Android:
 
@@ -42,8 +42,8 @@ Cordova will generate a new Android project in the platforms/android directory.
 
 A Docker image with all pre-requisites for Android builds is included. To build:
 
-- Install dependencies with `./tools/build/build.sh npm ci`
-- Then build with `./tools/build/build.sh npm run action gulp -- build android`
+- Install dependencies with `./src/tools/build/build.sh npm ci`
+- Then build with `./src/tools/build/build.sh npm run action gulp -- build android`
 
 ### To install the APK
 

src/electron/custom_install_steps.nsh

@@ -57,8 +57,8 @@ ${StrRep}
 
   ; OutlineService files, stopping the service first in case it's still running.
   nsExec::Exec "$SYSDIR\net stop OutlineService"
-  File "${PROJECT_DIR}\tools\OutlineService\OutlineService\bin\OutlineService.exe"
-  File "${PROJECT_DIR}\tools\smartdnsblock\bin\smartdnsblock.exe"
+  File "${PROJECT_DIR}\src\tools\OutlineService\OutlineService\bin\OutlineService.exe"
+  File "${PROJECT_DIR}\src\tools\smartdnsblock\bin\smartdnsblock.exe"
   File "${PROJECT_DIR}\third_party\newtonsoft\Newtonsoft.Json.dll"
   File "${PROJECT_DIR}\src\electron\install_windows_service.bat"
 

src/electron/electron-builder.json

@@ -8,12 +8,9 @@
   "linux": {
     "target": {
       "target": "AppImage",
-      "arch": [
-        "x64",
-        "arm64"
-      ]
+      "arch": ["x64", "arm64"]
     },
-    "files": ["build/icons/png", "third_party/outline-go-tun2socks/linux", "tools/outline_proxy_controller/dist"],
+    "files": ["build/icons/png", "third_party/outline-go-tun2socks/linux", "src/tools/outline_proxy_controller/dist"],
     "icon": "build/icons/png",
     "category": "Network"
   },

tools/OutlineService/OutlineService.sln → src/tools/OutlineService/OutlineService.sln

@@ -1,31 +1,31 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2018
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutlineService", "OutlineService\OutlineService.csproj", "{F39A4491-9868-4A71-9BE1-980FADE10AC9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|Any CPU.ActiveCfg = Release|x86
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|Any CPU.Build.0 = Release|x86
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|x86.ActiveCfg = Release|x86
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|x86.Build.0 = Release|x86
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|x86.ActiveCfg = Release|x86
-		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {55663288-4604-4D50-8D4A-7222B9A2B6BF}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2018
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutlineService", "OutlineService\OutlineService.csproj", "{F39A4491-9868-4A71-9BE1-980FADE10AC9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|Any CPU.ActiveCfg = Release|x86
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|Any CPU.Build.0 = Release|x86
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|x86.ActiveCfg = Release|x86
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Debug|x86.Build.0 = Release|x86
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|x86.ActiveCfg = Release|x86
+		{F39A4491-9868-4A71-9BE1-980FADE10AC9}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {55663288-4604-4D50-8D4A-7222B9A2B6BF}
+	EndGlobalSection
+EndGlobal

tools/OutlineService/OutlineService/App.config → src/tools/OutlineService/OutlineService/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
 </configuration>