From 946a5e9c405d1f44f1dff141ffb46bf25de18de2 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Mon, 9 Nov 2020 01:11:08 -0500
Subject: [PATCH] moved stuff to core/

---
 src/commands.cpp             |  2 +-
 src/{ => core}/conf.cpp      |  6 ++--
 src/{ => core}/conf.h        |  0
 src/{ => core}/context.cpp   |  6 ++--
 src/{ => core}/context.h     |  2 +-
 src/{ => core}/env.cpp       |  4 +--
 src/{ => core}/env.h         |  2 +-
 src/{ => core}/op.cpp        |  4 +--
 src/{ => core}/op.h          |  2 +-
 src/core/pch.h               |  2 ++
 src/{ => core}/process.cpp   |  2 +-
 src/{ => core}/process.h     |  2 +-
 src/main.cpp                 |  4 +--
 src/net.cpp                  |  6 ++--
 src/tasks/task.cpp           |  4 +--
 src/tasks/task.h             |  2 +-
 src/tasks/tasks.h            |  4 +--
 src/tools/git.cpp            |  2 +-
 src/tools/jom.cpp            |  2 +-
 src/tools/msbuild.cpp        |  2 +-
 src/tools/patcher.cpp        |  2 +-
 src/tools/process_runner.cpp |  2 +-
 src/tools/tools.cpp          |  4 +--
 src/tools/tools.h            |  8 ++---
 src/utility.cpp              |  8 ++---
 vs/mob.vcxproj               | 20 ++++++------
 vs/mob.vcxproj.filters       | 63 +++++++++++++++++++-----------------
 27 files changed, 86 insertions(+), 81 deletions(-)
 rename src/{ => core}/conf.cpp (99%)
 rename src/{ => core}/conf.h (100%)
 rename src/{ => core}/context.cpp (98%)
 rename src/{ => core}/context.h (99%)
 rename src/{ => core}/env.cpp (99%)
 rename src/{ => core}/env.h (98%)
 rename src/{ => core}/op.cpp (99%)
 rename src/{ => core}/op.h (98%)
 create mode 100644 src/core/pch.h
 rename src/{ => core}/process.cpp (99%)
 rename src/{ => core}/process.h (99%)

diff --git a/src/commands.cpp b/src/commands.cpp
index d218811..43f1583 100644
--- a/src/commands.cpp
+++ b/src/commands.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 #include "commands.h"
 #include "utility.h"
-#include "conf.h"
 #include "net.h"
+#include "core/conf.h"
 #include "tasks/tasks.h"
 #include "tools/tools.h"
 
diff --git a/src/conf.cpp b/src/core/conf.cpp
similarity index 99%
rename from src/conf.cpp
rename to src/core/conf.cpp
index f2f56b8..e384856 100644
--- a/src/conf.cpp
+++ b/src/core/conf.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 #include "conf.h"
-#include "utility.h"
 #include "context.h"
 #include "process.h"
-#include "tasks/task.h"
-#include "tools/tools.h"
+#include "../utility.h"
+#include "../tasks/task.h"
+#include "../tools/tools.h"
 
 namespace mob
 {
diff --git a/src/conf.h b/src/core/conf.h
similarity index 100%
rename from src/conf.h
rename to src/core/conf.h
diff --git a/src/context.cpp b/src/core/context.cpp
similarity index 98%
rename from src/context.cpp
rename to src/core/context.cpp
index bdb51c7..c752c5c 100644
--- a/src/context.cpp
+++ b/src/core/context.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 #include "context.h"
-#include "utility.h"
 #include "conf.h"
-#include "tasks/task.h"
-#include "tools/tools.h"
+#include "../utility.h"
+#include "../tasks/task.h"
+#include "../tools/tools.h"
 
 namespace mob::details
 {
diff --git a/src/context.h b/src/core/context.h
similarity index 99%
rename from src/context.h
rename to src/core/context.h
index f6992d3..d3f2c90 100644
--- a/src/context.h
+++ b/src/core/context.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "utility.h"
+#include "../utility.h"
 
 namespace mob
 {
diff --git a/src/env.cpp b/src/core/env.cpp
similarity index 99%
rename from src/env.cpp
rename to src/core/env.cpp
index cc44d60..141a597 100644
--- a/src/env.cpp
+++ b/src/core/env.cpp
@@ -4,8 +4,8 @@
 #include "process.h"
 #include "op.h"
 #include "context.h"
-#include "utility.h"
-#include "tools/tools.h"
+#include "../utility.h"
+#include "../tools/tools.h"
 
 namespace mob
 {
diff --git a/src/env.h b/src/core/env.h
similarity index 98%
rename from src/env.h
rename to src/core/env.h
index 01d4fed..0db542c 100644
--- a/src/env.h
+++ b/src/core/env.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "utility.h"
+#include "../utility.h"
 
 namespace mob
 {
diff --git a/src/op.cpp b/src/core/op.cpp
similarity index 99%
rename from src/op.cpp
rename to src/core/op.cpp
index f9f5ec1..7500460 100644
--- a/src/op.cpp
+++ b/src/core/op.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 #include "op.h"
-#include "utility.h"
 #include "conf.h"
 #include "context.h"
 #include "process.h"
-#include "tools/tools.h"
+#include "../utility.h"
+#include "../tools/tools.h"
 
 namespace mob::op
 {
diff --git a/src/op.h b/src/core/op.h
similarity index 98%
rename from src/op.h
rename to src/core/op.h
index 10f4552..b81fc16 100644
--- a/src/op.h
+++ b/src/core/op.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "utility.h"
+#include "../utility.h"
 
 namespace mob { class context; }
 
diff --git a/src/core/pch.h b/src/core/pch.h
new file mode 100644
index 0000000..d486962
--- /dev/null
+++ b/src/core/pch.h
@@ -0,0 +1,2 @@
+// for intellisense
+#include "../pch.h"
diff --git a/src/process.cpp b/src/core/process.cpp
similarity index 99%
rename from src/process.cpp
rename to src/core/process.cpp
index 73d6dff..5bd9de0 100644
--- a/src/process.cpp
+++ b/src/core/process.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 #include "process.h"
 #include "conf.h"
-#include "net.h"
 #include "context.h"
 #include "op.h"
+#include "../net.h"
 
 namespace mob
 {
diff --git a/src/process.h b/src/core/process.h
similarity index 99%
rename from src/process.h
rename to src/core/process.h
index b220fbf..5153435 100644
--- a/src/process.h
+++ b/src/core/process.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "utility.h"
 #include "env.h"
 #include "context.h"
+#include "../utility.h"
 
 namespace mob
 {
diff --git a/src/main.cpp b/src/main.cpp
index 91c1947..1301fe4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
-#include "conf.h"
 #include "net.h"
-#include "op.h"
 #include "utility.h"
 #include "commands.h"
+#include "core/conf.h"
+#include "core/op.h"
 #include "tasks/tasks.h"
 #include "tools/tools.h"
 
diff --git a/src/net.cpp b/src/net.cpp
index 2b9d8ff..ca240a2 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 #include "net.h"
-#include "conf.h"
-#include "op.h"
 #include "utility.h"
-#include "context.h"
+#include "core/conf.h"
+#include "core/op.h"
+#include "core/context.h"
 
 namespace mob
 {
diff --git a/src/tasks/task.cpp b/src/tasks/task.cpp
index d45594d..ad59d86 100644
--- a/src/tasks/task.cpp
+++ b/src/tasks/task.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 #include "task.h"
-#include "../conf.h"
-#include "../op.h"
+#include "../core/conf.h"
+#include "../core/op.h"
 #include "../tools/tools.h"
 
 namespace mob
diff --git a/src/tasks/task.h b/src/tasks/task.h
index fad22eb..788056c 100644
--- a/src/tasks/task.h
+++ b/src/tasks/task.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "../utility.h"
-#include "../context.h"
+#include "../core/context.h"
 #include "../tools/tools.h"
 
 namespace mob
diff --git a/src/tasks/tasks.h b/src/tasks/tasks.h
index ac1c4c5..158ba95 100644
--- a/src/tasks/tasks.h
+++ b/src/tasks/tasks.h
@@ -2,9 +2,9 @@
 
 #include "task.h"
 #include "../net.h"
-#include "../conf.h"
 #include "../utility.h"
-#include "../op.h"
+#include "../core/conf.h"
+#include "../core/op.h"
 
 namespace mob
 {
diff --git a/src/tools/git.cpp b/src/tools/git.cpp
index a120fff..59fe345 100644
--- a/src/tools/git.cpp
+++ b/src/tools/git.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "tools.h"
-#include "../conf.h"
+#include "../core/conf.h"
 
 namespace mob
 {
diff --git a/src/tools/jom.cpp b/src/tools/jom.cpp
index 4c4b8bf..45426c0 100644
--- a/src/tools/jom.cpp
+++ b/src/tools/jom.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "tools.h"
-#include "../conf.h"
+#include "../core/conf.h"
 
 namespace mob
 {
diff --git a/src/tools/msbuild.cpp b/src/tools/msbuild.cpp
index 4e0f2c0..3c23ad5 100644
--- a/src/tools/msbuild.cpp
+++ b/src/tools/msbuild.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "tools.h"
-#include "../conf.h"
+#include "../core/conf.h"
 
 namespace mob
 {
diff --git a/src/tools/patcher.cpp b/src/tools/patcher.cpp
index c9ea11b..27d6916 100644
--- a/src/tools/patcher.cpp
+++ b/src/tools/patcher.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "tools.h"
-#include "../conf.h"
+#include "../core/conf.h"
 
 namespace mob
 {
diff --git a/src/tools/process_runner.cpp b/src/tools/process_runner.cpp
index 96845a3..53cdbcc 100644
--- a/src/tools/process_runner.cpp
+++ b/src/tools/process_runner.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 #include "tools.h"
-#include "../conf.h"
+#include "../core/conf.h"
 
 namespace mob
 {
diff --git a/src/tools/tools.cpp b/src/tools/tools.cpp
index a3f851e..e74599f 100644
--- a/src/tools/tools.cpp
+++ b/src/tools/tools.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 #include "tools.h"
 #include "../utility.h"
-#include "../op.h"
-#include "../conf.h"
+#include "../core/op.h"
+#include "../core/conf.h"
 #include "../tasks/tasks.h"
 
 namespace mob
diff --git a/src/tools/tools.h b/src/tools/tools.h
index f960dd5..098b839 100644
--- a/src/tools/tools.h
+++ b/src/tools/tools.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "../net.h"
-#include "../process.h"
-#include "../conf.h"
-#include "../op.h"
-#include "../context.h"
+#include "../core/process.h"
+#include "../core/conf.h"
+#include "../core/op.h"
+#include "../core/context.h"
 
 namespace mob
 {
diff --git a/src/utility.cpp b/src/utility.cpp
index cc4ef01..cd54b1d 100644
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 #include "utility.h"
-#include "conf.h"
-#include "op.h"
 #include "net.h"
-#include "process.h"
-#include "context.h"
+#include "core/conf.h"
+#include "core/op.h"
+#include "core/process.h"
+#include "core/context.h"
 
 namespace mob
 {
diff --git a/vs/mob.vcxproj b/vs/mob.vcxproj
index a26a9b4..fc990ad 100644
--- a/vs/mob.vcxproj
+++ b/vs/mob.vcxproj
@@ -59,17 +59,17 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\src\commands.cpp" />
-    <ClCompile Include="..\src\conf.cpp" />
-    <ClCompile Include="..\src\context.cpp" />
-    <ClCompile Include="..\src\env.cpp" />
+    <ClCompile Include="..\src\core\conf.cpp" />
+    <ClCompile Include="..\src\core\context.cpp" />
+    <ClCompile Include="..\src\core\env.cpp" />
+    <ClCompile Include="..\src\core\op.cpp" />
+    <ClCompile Include="..\src\core\process.cpp" />
     <ClCompile Include="..\src\main.cpp" />
     <ClCompile Include="..\src\net.cpp" />
-    <ClCompile Include="..\src\op.cpp" />
     <ClCompile Include="..\src\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\process.cpp" />
     <ClCompile Include="..\src\tasks\boost.cpp" />
     <ClCompile Include="..\src\tasks\boost_di.cpp" />
     <ClCompile Include="..\src\tasks\bzip2.cpp" />
@@ -109,13 +109,13 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\commands.h" />
-    <ClInclude Include="..\src\conf.h" />
-    <ClInclude Include="..\src\context.h" />
-    <ClInclude Include="..\src\env.h" />
-    <ClInclude Include="..\src\op.h" />
+    <ClInclude Include="..\src\core\conf.h" />
+    <ClInclude Include="..\src\core\context.h" />
+    <ClInclude Include="..\src\core\env.h" />
+    <ClInclude Include="..\src\core\op.h" />
+    <ClInclude Include="..\src\core\process.h" />
     <ClInclude Include="..\src\net.h" />
     <ClInclude Include="..\src\pch.h" />
-    <ClInclude Include="..\src\process.h" />
     <ClInclude Include="..\src\tasks\task.h" />
     <ClInclude Include="..\src\tasks\tasks.h" />
     <ClInclude Include="..\src\tools\tools.h" />
diff --git a/vs/mob.vcxproj.filters b/vs/mob.vcxproj.filters
index 5e10200..2420968 100644
--- a/vs/mob.vcxproj.filters
+++ b/vs/mob.vcxproj.filters
@@ -10,6 +10,9 @@
     <Filter Include="src\tools">
       <UniqueIdentifier>{b0afbfc3-9b49-4768-9077-a8284ced4416}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\core">
+      <UniqueIdentifier>{6e4d31d5-100c-4a4d-8e7d-4c48939819bd}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\main.cpp">
@@ -18,18 +21,12 @@
     <ClCompile Include="..\src\pch.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\conf.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\net.cpp">
       <Filter>src</Filter>
     </ClCompile>
     <ClCompile Include="..\src\utility.cpp">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\op.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\tasks\fmt.cpp">
       <Filter>src\tasks</Filter>
     </ClCompile>
@@ -87,15 +84,6 @@
     <ClCompile Include="..\src\tasks\pyqt.cpp">
       <Filter>src\tasks</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\process.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\env.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\context.cpp">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\tools\extractor.cpp">
       <Filter>src\tools</Filter>
     </ClCompile>
@@ -147,6 +135,21 @@
     <ClCompile Include="..\src\tasks\translations.cpp">
       <Filter>src\tasks</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\core\env.cpp">
+      <Filter>src\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\op.cpp">
+      <Filter>src\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\process.cpp">
+      <Filter>src\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\conf.cpp">
+      <Filter>src\core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\context.cpp">
+      <Filter>src\core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\pch.h">
@@ -155,35 +158,35 @@
     <ClInclude Include="..\src\net.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\conf.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\utility.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\op.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\tasks\task.h">
       <Filter>src\tasks</Filter>
     </ClInclude>
     <ClInclude Include="..\src\tasks\tasks.h">
       <Filter>src\tasks</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\process.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\env.h">
-      <Filter>src</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\context.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\tools\tools.h">
       <Filter>src\tools</Filter>
     </ClInclude>
     <ClInclude Include="..\src\commands.h">
       <Filter>src</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\core\context.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\env.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\op.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\process.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\conf.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file