Merge pull request #36 from sidrus/fix/ckan-integration

Fix/ckan integration
TeleIO · Apr 2, 2020 · a3a5452 · a3a5452
2 parents 3a19657 + 06b298f
commit a3a5452
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/Telemachus/AfterBuild.bat b/Telemachus/AfterBuild.bat
@@ -4,8 +4,9 @@ rd /s /q "%1..\ksp-telemachus-dev\GameData\Telemachus"
 xcopy "%2Servers.dll" "%1..\publish\GameData\Telemachus\Plugins\" /e /y /i /r
 xcopy "%2Telemachus.dll" "%1..\publish\GameData\Telemachus\Plugins\" /e /y /i /r
 xcopy "%2websocket-sharp.dll" "%1..\publish\GameData\Telemachus\Plugins\" /e /y /i /r
-xcopy "%2\deps\MiniAVC.dll" "%1..\publish\GameData\Telemachus\" /e /y /i /r
-xcopy "%2\deps\telemachusReborn.version" "%1..\publish\GameData\Telemachus\" /e /y /i /r
+
+xcopy "%1..\dependencies\MiniAVC.dll" "%1..\publish\GameData\Telemachus\" /y /i /r
+xcopy "%1..\TelemachusReborn.version" "%1..\publish\GameData\Telemachus\" /y /i /r
 
 xcopy "%1..\Parts\*" "%1..\publish\GameData\Telemachus\Parts\"  /e /y /i /r
 xcopy "%1..\WebPages\WebPages\src\*" "%1..\publish\GameData\Telemachus\Plugins\PluginData\Telemachus\" /e /y /i /r

diff --git a/Telemachus/AfterBuild.sh b/Telemachus/AfterBuild.sh
@@ -24,8 +24,8 @@ mkdir -p "$ProjectDir/../publish/GameData/Telemachus/Plugins/PluginData/Telemach
 cp "$TargetDir/Telemachus.dll" "$ProjectDir/../publish/GameData/Telemachus/Plugins/"
 cp "$TargetDir/websocket-sharp.dll" "$ProjectDir/../publish/GameData/Telemachus/Plugins/"
 
-cp "$TargetDir/deps/MiniAVC.dll" "$ProjectDir/../publish/GameData/Telemachus/"
-cp "$TargetDir/deps/TelemachusReborn.version" "$ProjectDir/../publish/GameData/Telemachus/"
+cp "$ProjectDir/../dependencies/MiniAVC.dll" "$ProjectDir/../publish/GameData/Telemachus/"
+cp "$ProjectDir/../TelemachusReborn.version" "$ProjectDir/../publish/GameData/Telemachus/"
 
 cp -ra "$ProjectDir/../Parts/." "$ProjectDir/../publish/GameData/Telemachus/Parts/" 
 cp -ra "$ProjectDir/../WebPages/WebPages/src/." "$ProjectDir/../publish/GameData/Telemachus/Plugins/PluginData/Telemachus/"

diff --git a/Telemachus/Telemachus.csproj b/Telemachus/Telemachus.csproj
@@ -117,14 +117,6 @@
   <ItemGroup>
     <Content Include="AfterBuild.bat" />
     <Content Include="AfterBuild.sh" />
-    <Content Include="deps\MiniAVC.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="deps\TelemachusReborn.version">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/Telemachus/deps/TelemachusReborn.version → TelemachusReborn.version b/Telemachus/deps/TelemachusReborn.version → TelemachusReborn.version
@@ -1,6 +1,6 @@
 {
   "NAME": "Telemachus",
-  "URL": "https://raw.githubusercontent.com/TeleIO/Telemachus-1/master/Telemachus/deps/TelemachusReborn.version",
+  "URL": "https://raw.githubusercontent.com/TeleIO/Telemachus-1/master/TelemachusReborn.version",
   "DOWNLOAD": "https://github.com/TeleIO/Telemachus-1/releases/latest",
   "GITHUB": {
     "USERNAME": "TeleIO",

diff --git a/Telemachus/deps/MiniAVC.dll → dependencies/MiniAVC.dll b/Telemachus/deps/MiniAVC.dll → dependencies/MiniAVC.dll