Use submodules vs. copied source

Now both pdcurses and my_basic are pulled in via submodules from github.com/wwivbbs. This makes it easy to see if there's any drift from the main repository.
wwivbbs · Jun 18, 2017 · 6908697 · 6908697
1 parent f76990a
commit 6908697
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 32 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "deps/my_basic"]
 	path = deps/my_basic
-	url = https://github.com/wwiv/my_basic.git
+	url = https://github.com/wwivbbs/my_basic.git
+[submodule "deps/pdcurses"]
+	path = deps/pdcurses
+	url = https://github.com/wwivbbs/PDCurses.git
diff --git a/WWIV.sln b/WWIV.sln
@@ -1,16 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26228.4
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbs", "bbs\bbs.vcxproj", "{DE1021F3-98A3-4468-A6D9-57B4D83D0165}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdcurses", "deps\pdcurses-3.4\pdcurses.vcxproj", "{EC52CEDA-4F35-469A-8975-98776EA8EA93}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93} = {EC52CEDA-4F35-469A-8975-98776EA8EA93}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "init", "init\init.vcxproj", "{0C6A0F55-D818-43D5-ACE4-848D6AD1C297}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93} = {EC52CEDA-4F35-469A-8975-98776EA8EA93}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbs_test", "bbs_test\bbs_test.vcxproj", "{EB828D24-C453-4059-A484-2B6BFB96E1C4}"
 	ProjectSection(ProjectDependencies) = postProject
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93} = {EC52CEDA-4F35-469A-8975-98776EA8EA93}
 		{BCF878F6-1997-4C3D-864E-12F0C1B5EB5E} = {BCF878F6-1997-4C3D-864E-12F0C1B5EB5E}
 	EndProjectSection
 EndProject
@@ -19,6 +24,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bbs_lib", "bbs\bbs_lib.vcxproj", "{BCF878F6-1997-4C3D-864E-12F0C1B5EB5E}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "localui", "localui\localui.vcxproj", "{8EBD5A9A-E149-4E24-B5CA-7EBE0CC45A08}"
+	ProjectSection(ProjectDependencies) = postProject
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93} = {EC52CEDA-4F35-469A-8975-98776EA8EA93}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{160CA888-2434-48A8-AD4E-02140E3B2C52}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -68,6 +76,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "networkc", "networkc\networ
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wwivd", "wwivd\wwivd.vcxproj", "{8DC4E578-7568-49B1-91D8-207CB5887DD9}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pdcurses", "deps\pdcurses\pdcurses.vcxproj", "{EC52CEDA-4F35-469A-8975-98776EA8EA93}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -88,16 +98,6 @@ Global
 		{DE1021F3-98A3-4468-A6D9-57B4D83D0165}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{DE1021F3-98A3-4468-A6D9-57B4D83D0165}.Release|Win32.ActiveCfg = Release|Win32
 		{DE1021F3-98A3-4468-A6D9-57B4D83D0165}.Release|Win32.Build.0 = Release|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Win32.Build.0 = Debug|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Any CPU.ActiveCfg = Release|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Win32.ActiveCfg = Release|Win32
-		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Win32.Build.0 = Release|Win32
 		{0C6A0F55-D818-43D5-ACE4-848D6AD1C297}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{0C6A0F55-D818-43D5-ACE4-848D6AD1C297}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
 		{0C6A0F55-D818-43D5-ACE4-848D6AD1C297}.Debug|Mixed Platforms.Build.0 = Debug|Win32
@@ -343,6 +343,16 @@ Global
 		{8DC4E578-7568-49B1-91D8-207CB5887DD9}.Release|Mixed Platforms.Build.0 = Release|Win32
 		{8DC4E578-7568-49B1-91D8-207CB5887DD9}.Release|Win32.ActiveCfg = Release|Win32
 		{8DC4E578-7568-49B1-91D8-207CB5887DD9}.Release|Win32.Build.0 = Release|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Win32.ActiveCfg = Debug|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Debug|Win32.Build.0 = Debug|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Any CPU.ActiveCfg = Release|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Win32.ActiveCfg = Release|Win32
+		{EC52CEDA-4F35-469A-8975-98776EA8EA93}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/bbs/CMakeLists.txt b/bbs/CMakeLists.txt
@@ -114,7 +114,7 @@ set(COMMON_SOURCES
  xinit.cpp
  wfc.cpp
  workspace.cpp
- ../deps/my_basic-master/core/my_basic.c
+ ../deps/my_basic/core/my_basic.c
 )
 
 set(BBS_MAIN bbs_main.cpp)

diff --git a/bbs/basic.cpp b/bbs/basic.cpp
@@ -537,7 +537,8 @@ bool RunBasicScript(const std::string& script_name) {
   struct mb_interpreter_t* bas = nullptr;
   mb_open(&bas);
   mb_set_userdata(bas, &wwiv_userdata);
-  mb_debug_set_stepped_handler(bas, _on_stepped);
+  // TODO(rushfan): Update to new syntax
+  // mb_debug_set_stepped_handler(bas, _on_stepped);
   mb_set_error_handler(bas, _on_error);
   mb_set_import_handler(bas, [](struct mb_interpreter_t* bas, const char* p) -> int {
     return (LoadBasicFile(bas, p)) ? MB_FUNC_OK : MB_FUNC_ERR;
@@ -555,7 +556,7 @@ bool RunBasicScript(const std::string& script_name) {
     return false;
   }
 
-  auto ret = mb_run(bas);
+  auto ret = mb_run(bas, false);
 
   mb_close(&bas);
   return ret == MB_FUNC_OK;

diff --git a/bbs/bbs.vcxproj b/bbs/bbs.vcxproj
@@ -91,6 +91,9 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ProjectReference Include="..\deps\pdcurses\pdcurses.vcxproj">
+      <Project>{ec52ceda-4f35-469a-8975-98776ea8ea93}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\localui\localui.vcxproj">
       <Project>{8ebd5a9a-e149-4e24-b5ca-7ebe0cc45a08}</Project>
     </ProjectReference>
@@ -104,4 +107,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/bbs/bbs_lib.vcxproj b/bbs/bbs_lib.vcxproj
@@ -42,14 +42,14 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\;$(UniversalCRT_IncludePath);$(IncludePath);$(ProjectDir)..\deps\pdcurses-3.4\include;$(ProjectDir)..\deps\cl342;$(ProjectDir)..\deps\cereal\include</IncludePath>
+    <IncludePath>$(ProjectDir)..\;$(ProjectDir)..\deps\cl342;$(ProjectDir)..\deps\cereal\include;$(ProjectDir)..\deps\pdcurses;$(IncludePath)</IncludePath>
     <IntDir>lib\$(Configuration)\</IntDir>
     <CodeAnalysisRuleSet>C:\Program Files\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir)..\;$(UniversalCRT_IncludePath);$(IncludePath);$(ProjectDir)..\deps\pdcurses-3.4\include;$(ProjectDir)..\deps\cl342;$(ProjectDir)..\deps\cereal\include</IncludePath>
+    <IncludePath>$(ProjectDir)..\;$(ProjectDir)..\deps\cl342;$(ProjectDir)..\deps\cereal\include;$(ProjectDir)..\deps\pdcurses;$(IncludePath)</IncludePath>
     <IntDir>lib\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -221,7 +221,7 @@
     <ClInclude Include="xinitini.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\deps\my_basic-master\core\my_basic.c" />
+    <ClCompile Include="..\deps\my_basic\core\my_basic.c" />
     <ClCompile Include="application.cpp" />
     <ClCompile Include="archivers.cpp" />
     <ClCompile Include="arword.cpp" />
@@ -348,6 +348,9 @@
     <ProjectReference Include="..\deps\cl342\crypt32.vcxproj">
       <Project>{d0793ab4-c236-4105-ad9e-7e8b1716037b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\deps\pdcurses\pdcurses.vcxproj">
+      <Project>{ec52ceda-4f35-469a-8975-98776ea8ea93}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\localui\localui.vcxproj">
       <Project>{8ebd5a9a-e149-4e24-b5ca-7ebe0cc45a08}</Project>
     </ProjectReference>
@@ -361,4 +364,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
diff --git a/bbs/bbs_lib.vcxproj.filters b/bbs/bbs_lib.vcxproj.filters
@@ -352,7 +352,7 @@
     <ClCompile Include="basic.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\deps\my_basic-master\core\my_basic.c">
+    <ClCompile Include="..\deps\my_basic\core\my_basic.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="gfileedit.cpp">
@@ -744,4 +744,4 @@
   <ItemGroup>
     <Text Include="todo.txt" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/bbs_test/bbs_test.vcxproj b/bbs_test/bbs_test.vcxproj
@@ -116,6 +116,9 @@
     <ProjectReference Include="..\deps\googletest-master\googletest\msvc\gtest-md.vcxproj">
       <Project>{c8f6c172-56f2-4e76-b5fa-c3b423b31be8}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\deps\pdcurses\pdcurses.vcxproj">
+      <Project>{ec52ceda-4f35-469a-8975-98776ea8ea93}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="bbs_helper.h" />

diff --git a/deps/pdcurses b/deps/pdcurses
diff --git a/init/init.vcxproj b/init/init.vcxproj
@@ -42,11 +42,11 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses-3.4\include\;$(ProjectDir)..\localui\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)..\deps\pdcurses;$(ProjectDir)..\localui\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses-3.4\include\;$(ProjectDir)..\localui\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)..\deps\pdcurses;$(ProjectDir)..\localui\;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -136,7 +136,7 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{160ca888-2434-48a8-ad4e-02140e3b2c52}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\deps\pdcurses-3.4\pdcurses.vcxproj">
+    <ProjectReference Include="..\deps\pdcurses\pdcurses.vcxproj">
       <Project>{ec52ceda-4f35-469a-8975-98776ea8ea93}</Project>
     </ProjectReference>
     <ProjectReference Include="..\localui\localui.vcxproj">

diff --git a/localui/localui.vcxproj b/localui/localui.vcxproj
@@ -42,12 +42,12 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses-3.4\include\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses;$(IncludePath)</IncludePath>
     <IntDir>lib\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses-3.4\include\;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir);$(ProjectDir)\..\;$(ProjectDir)\..\deps\pdcurses;$(IncludePath)</IncludePath>
     <IntDir>lib\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -109,9 +109,6 @@
     <ProjectReference Include="..\core\core.vcxproj">
       <Project>{160ca888-2434-48a8-ad4e-02140e3b2c52}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\deps\pdcurses-3.4\pdcurses.vcxproj">
-      <Project>{ec52ceda-4f35-469a-8975-98776ea8ea93}</Project>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">