Skip to content

Commit

Permalink
Merge pull request #34 from sidrus/fix/ckan-integration
Browse files Browse the repository at this point in the history
updated version information to fix CKAN integration
  • Loading branch information
sidrus authored Apr 2, 2020
2 parents 9dd0732 + 90e7123 commit c90d1f0
Show file tree
Hide file tree
Showing 8 changed files with 219 additions and 207 deletions.
67 changes: 35 additions & 32 deletions Telemachus.sln
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telemachus", "Telemachus\Telemachus.csproj", "{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Any CPU.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29905.134
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Telemachus", "Telemachus\Telemachus.csproj", "{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Mixed Platforms.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|Mixed Platforms.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Debug|x86.ActiveCfg = Debug|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Any CPU.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E444BC91-A875-48C1-9E6B-B875B6149261}
EndGlobalSection
EndGlobal
2 changes: 2 additions & 0 deletions Telemachus/AfterBuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ 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..\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
Expand Down
3 changes: 3 additions & 0 deletions Telemachus/AfterBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ 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 -ra "$ProjectDir/../Parts/." "$ProjectDir/../publish/GameData/Telemachus/Parts/"
cp -ra "$ProjectDir/../WebPages/WebPages/src/." "$ProjectDir/../publish/GameData/Telemachus/Plugins/PluginData/Telemachus/"
cp -ra "$ProjectDir/../Licences/." "$ProjectDir/../publish/GameData/Telemachus/"
Expand Down
262 changes: 135 additions & 127 deletions Telemachus/Telemachus.csproj
Original file line number Diff line number Diff line change
@@ -1,130 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Telemachus</RootNamespace>
<AssemblyName>Telemachus</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>4</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>4</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
</Reference>
<Reference Include="websocket-sharp">
<HintPath>..\websocket-sharp.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\references\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\references\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\references\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule">
<HintPath>..\references\UnityEngine.ImageConversionModule</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule">
<HintPath>..\references\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\references\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\references\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\CameraSnapshots\CameraCapture.cs" />
<Compile Include="src\CameraSnapshots\IVACameraCapture.cs" />
<Compile Include="src\CameraSnapshots\CurrentFlightCameraCapture.cs" />
<Compile Include="src\CameraSnapshots\RasterPropMonitorCamera.cs" />
<Compile Include="src\CameraSnapshots\RasterPropMonitorCameraCapture.cs" />
<Compile Include="src\CameraSnapshots\CameraCaptureManager.cs" />
<Compile Include="src\CameraSnapshots\SnapshotRenderer.cs" />
<Compile Include="src\DataLinkFormatters.cs" />
<Compile Include="src\DataLinkHandlers.cs" />
<Compile Include="src\CameraResponsibility.cs" />
<Compile Include="src\DataLinkResponsibility.cs" />
<Compile Include="src\ElseResponsibility.cs" />
<Compile Include="src\IOPageResponsibility.cs" />
<Compile Include="src\KSPWebServerDispatcher.cs" />
<Compile Include="src\PluginLogger.cs" />
<Compile Include="src\PluginRegistration.cs" />
<Compile Include="src\Plugins\RasterPropMonitorPlugin.cs" />
<Compile Include="src\ServerConfiguration.cs" />
<Compile Include="src\SimpleJSON.cs" />
<Compile Include="src\TelemachusBehaviour.cs" />
<Compile Include="src\TelemachusPartModules.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="src\UpLinkDownLinkRate.cs" />
<Compile Include="src\VesselChangeDetector.cs" />
<Compile Include="src\KSPWebSocketService.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="AfterBuild.bat" />
<Content Include="AfterBuild.sh" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{AF7DF6B2-7D88-4399-92FC-E21EC15231DE}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Telemachus</RootNamespace>
<AssemblyName>Telemachus</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>4</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<LangVersion>4</LangVersion>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.ImageConversionModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\ksp-telemachus-dev\KSP_Data\Managed\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
</Reference>
<Reference Include="websocket-sharp">
<HintPath>..\websocket-sharp.dll</HintPath>
</Reference>
<Reference Include="UnityEngine">
<HintPath>..\references\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.UI">
<HintPath>..\references\UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.CoreModule">
<HintPath>..\references\UnityEngine.CoreModule.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.ImageConversionModule">
<HintPath>..\references\UnityEngine.ImageConversionModule</HintPath>
</Reference>
<Reference Include="UnityEngine.UnityWebRequestWWWModule">
<HintPath>..\references\UnityEngine.UnityWebRequestWWWModule.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp">
<HintPath>..\references\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp-firstpass">
<HintPath>..\references\Assembly-CSharp-firstpass.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="src\CameraSnapshots\CameraCapture.cs" />
<Compile Include="src\CameraSnapshots\IVACameraCapture.cs" />
<Compile Include="src\CameraSnapshots\CurrentFlightCameraCapture.cs" />
<Compile Include="src\CameraSnapshots\RasterPropMonitorCamera.cs" />
<Compile Include="src\CameraSnapshots\RasterPropMonitorCameraCapture.cs" />
<Compile Include="src\CameraSnapshots\CameraCaptureManager.cs" />
<Compile Include="src\CameraSnapshots\SnapshotRenderer.cs" />
<Compile Include="src\DataLinkFormatters.cs" />
<Compile Include="src\DataLinkHandlers.cs" />
<Compile Include="src\CameraResponsibility.cs" />
<Compile Include="src\DataLinkResponsibility.cs" />
<Compile Include="src\ElseResponsibility.cs" />
<Compile Include="src\IOPageResponsibility.cs" />
<Compile Include="src\KSPWebServerDispatcher.cs" />
<Compile Include="src\PluginLogger.cs" />
<Compile Include="src\PluginRegistration.cs" />
<Compile Include="src\Plugins\RasterPropMonitorPlugin.cs" />
<Compile Include="src\ServerConfiguration.cs" />
<Compile Include="src\SimpleJSON.cs" />
<Compile Include="src\TelemachusBehaviour.cs" />
<Compile Include="src\TelemachusPartModules.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="src\UpLinkDownLinkRate.cs" />
<Compile Include="src\VesselChangeDetector.cs" />
<Compile Include="src\KSPWebSocketService.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<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.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>-->
<Target Name="AfterBuild">
<Exec Command="./AfterBuild.sh $(ProjectDir) $(TargetDir)" Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="AfterBuild.bat $(ProjectDir) $(TargetDir)" Condition=" '$(OS)' == 'Windows_NT' " />
</Target>
</Project>
</Target>-->
<Target Name="AfterBuild">
<Exec Command="./AfterBuild.sh $(ProjectDir) $(TargetDir)" Condition=" '$(OS)' != 'Windows_NT' " />
<Exec Command="AfterBuild.bat $(ProjectDir) $(TargetDir)" Condition=" '$(OS)' == 'Windows_NT' " />
</Target>
</Project>
Binary file added Telemachus/deps/MiniAVC.dll
Binary file not shown.
19 changes: 9 additions & 10 deletions Telemachus.version → Telemachus/deps/TelemachusReborn.version
Original file line number Diff line number Diff line change
@@ -1,32 +1,31 @@
{
"NAME": "Telemachus",
"URL": "https://raw.githubusercontent.com/TeleIO/Telemachus-1/master/Telemachus.version",
"URL": "https://raw.githubusercontent.com/TeleIO/Telemachus-1/master/Telemachus/TelemachusReborn.version",
"DOWNLOAD": "https://github.com/TeleIO/Telemachus-1/releases/latest",
"GITHUB":
{
"USERNAME":"TeleIO",
"REPOSITORY":"Telemachus-1",
"ALLOW_PRE_RELEASE":false,
"REPOSITORY":"Telemachus-1"
},
"VERSION":{
"MAJOR": 1,
"MINOR": 8,
"PATCH": 0,
"MINOR": 7,
"PATCH": 35,
"BUILD": 0
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 7,
"PATCH": 0
"MINOR": 9,
"PATCH": 1
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 8,
"MINOR": 6,
"PATCH": 0
},
"KSP_VERSION_MAX": {
"MAJOR": 1,
"MINOR": 8,
"PATCH": 90
"MINOR": 9,
"PATCH": 9
}
}
Loading

0 comments on commit c90d1f0

Please sign in to comment.