Skip to content

Commit 4ce7dbc

Browse files
jwvanderbeckjwvanderbeck
authored
Feature/build updates (#204)
* Change backend GUI code to work in latest Unity. This code really is kudlgy but don't feel like completely rewriting it right now * Update DLLs * Changes to build process to include portable PDB files, and AfterBuild updates
1 parent c1d122c commit 4ce7dbc

File tree

9 files changed

+4
-57
lines changed

9 files changed

+4
-57
lines changed

‎TestFlight.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
<ErrorReport>prompt</ErrorReport>
2424
<WarningLevel>4</WarningLevel>
2525
<CustomCommands>
26-
<CustomCommands>
27-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../GameData/TestFlight/Plugins" />
28-
</CustomCommands>
2926
</CustomCommands>
3027
<DebugSymbols>true</DebugSymbols>
3128
<Prefer32Bit>false</Prefer32Bit>
@@ -39,9 +36,6 @@
3936
<ErrorReport>prompt</ErrorReport>
4037
<WarningLevel>4</WarningLevel>
4138
<CustomCommands>
42-
<CustomCommands>
43-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../GameData/TestFlight/Plugins" />
44-
</CustomCommands>
4539
</CustomCommands>
4640
<Prefer32Bit>false</Prefer32Bit>
4741
<PlatformTarget>x64</PlatformTarget>

‎TestFlightAPI/TestFlightAPI/TestFlightAPI.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
<WarningLevel>4</WarningLevel>
2222
<ConsolePause>False</ConsolePause>
2323
<CustomCommands>
24-
<CustomCommands>
25-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../../../GameData/TestFlight/Plugins" />
26-
</CustomCommands>
2724
</CustomCommands>
2825
<Prefer32Bit>false</Prefer32Bit>
2926
<PlatformTarget>x64</PlatformTarget>
@@ -36,9 +33,6 @@
3633
<WarningLevel>4</WarningLevel>
3734
<ConsolePause>False</ConsolePause>
3835
<CustomCommands>
39-
<CustomCommands>
40-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../../../GameData/TestFlight/Plugins" />
41-
</CustomCommands>
4236
</CustomCommands>
4337
<Prefer32Bit>false</Prefer32Bit>
4438
<PlatformTarget>x64</PlatformTarget>

‎TestFlightAPI/TestFlightAPI/custom.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<FilesToCopy Include="$(OutputPath)\TestFlightAPI.dll" />
3+
<FilesToCopy Include="$(OutputPath)\TestFlightAPI.*" />
44
</ItemGroup>
55
<ItemGroup>
66
<MDBFilesToCopy Include="$(OutputPath)\TestFlightAPI.dll.mdb" />

‎TestFlightContracts/custom.targets‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<FilesToCopy Include="$(OutputPath)\TestFlightContracts.dll" />
3+
<FilesToCopy Include="$(OutputPath)\TestFlightContracts.*" />
44
</ItemGroup>
55
<ItemGroup>
66
<MDBFilesToCopy Include="$(OutputPath)\TestFlightContracts.dll.mdb" />
77
</ItemGroup>
88
<Target Name="AfterBuild">
99
<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="..\GameData\TestFlight\Plugins\" />
10-
<!--<Copy SourceFiles="@(MDBFilesToCopy)" DestinationFolder="..\GameData\TestFlight\Plugins\" />-->
1110
</Target>
1211
</Project>

‎TestFlightCore/TestFlightCore/Resources.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,9 @@ internal class Resources
1616
//WHERE SHOULD THESE BE???
1717
internal static String PathApp = KSPUtil.ApplicationRootPath.Replace("\\", "/");
1818
internal static String PathTestFlight = string.Format("{0}GameData/TestFlight", PathApp);
19-
//internal static String PathPlugin = string.Format("{0}/{1}", PathTriggerTech, KSPAlternateResourcePanel._AssemblyName);
2019
internal static String PathPlugin = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
2120
internal static String PathPluginResources = string.Format("{0}/Resources", PathTestFlight);
22-
internal static String PathPluginToolbarIcons = string.Format("{0}/Resources/ToolbarIcons", PathTestFlight);
2321
internal static String PathPluginTextures = string.Format("{0}/Resources/Textures", PathTestFlight);
24-
//internal static String PathPluginData = string.Format("{0}/Data", PathPlugin);
25-
internal static String PathPluginSounds = string.Format("{0}/Resources/Sounds", PathPlugin);
26-
27-
internal static String DBPathTestFlight = string.Format("TestFlight");
28-
internal static String DBPathPlugin = string.Format("TestFlight/{0}", TestFlightCore.TestFlightWindow._AssemblyName);
29-
internal static String DBPathResources = string.Format("{0}/Resources", DBPathPlugin);
30-
internal static String DBPathToolbarIcons = string.Format("{0}/Resources/ToolbarIcons", DBPathPlugin);
31-
internal static String DBPathTextures = string.Format("{0}/Resources/Textures", DBPathPlugin);
32-
internal static String DBPathPluginSounds = string.Format("{0}/Resources/Sounds", DBPathPlugin);
33-
3422

3523
internal static Texture2D texPanel;
3624
internal static Texture2D texPanelSolarizedDark;

‎TestFlightCore/TestFlightCore/TestFlightCore.csproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@
2020
<WarningLevel>4</WarningLevel>
2121
<ConsolePause>False</ConsolePause>
2222
<CustomCommands>
23-
<CustomCommands>
24-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../../../GameData/TestFlight/Plugins" />
25-
<Command type="AfterBuild" command="cp -r /Users/john/Developer/KSP/1.1/TestFlightDEV/Dev/_DEV/GitHub/TestFlight/GameData /Users/john/Developer/KSP/1.1/TestFlightDEV/Dev/" />
26-
</CustomCommands>
2723
</CustomCommands>
2824
<DebugSymbols>true</DebugSymbols>
2925
<Prefer32Bit>false</Prefer32Bit>
@@ -38,10 +34,6 @@
3834
<WarningLevel>4</WarningLevel>
3935
<ConsolePause>False</ConsolePause>
4036
<CustomCommands>
41-
<CustomCommands>
42-
<Command type="AfterBuild" command="cp ${TargetFile} ${TargetDir}/../../../../GameData/TestFlight/Plugins" />
43-
<Command type="AfterBuild" command="cp -r /Users/john/Developer/KSP/1.1/TestFlightDEV/Dev/_DEV/GitHub/TestFlight/GameData /Users/john/Developer/KSP/1.1/TestFlightDEV/Dev/" />
44-
</CustomCommands>
4537
</CustomCommands>
4638
<Prefer32Bit>false</Prefer32Bit>
4739
<PlatformTarget>x64</PlatformTarget>

‎TestFlightCore/TestFlightCore/TestFlightKSC.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,9 @@ internal override void Start()
4242
{
4343
Log("Initializing KSC Window Hook");
4444
Instance = this;
45-
// Load out AssetBundle
46-
AssetLoader.LoadAssets(AssetLoaded, AssetLoader.GetAssetDefinitionWithName("TestFlight/testflight", "TFKSCCanvas"));
4745
StartCoroutine("ConnectToScenario");
4846
}
4947

50-
void AssetLoaded(AssetLoader.Loader loader)
51-
{
52-
// You get a object that contains all the object that match your laoding request
53-
for (int i = 0; i < loader.definitions.Length; i++ )
54-
{
55-
UnityEngine.Object o = loader.objects[i];
56-
if (o == null)
57-
continue;
58-
59-
if (o.GetType() == typeof(Canvas))
60-
kscCanvas = o as Canvas;
61-
}
62-
assetBundleLoaded = true;
63-
}
64-
6548
IEnumerator ConnectToScenario()
6649
{
6750
while (TestFlightManagerScenario.Instance == null)

‎TestFlightCore/TestFlightCore/custom.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<FilesToCopy Include="$(OutputPath)\TestFlightCore.dll" />
3+
<FilesToCopy Include="$(OutputPath)\TestFlightCore.*" />
44
</ItemGroup>
55
<ItemGroup>
66
<MDBFilesToCopy Include="$(OutputPath)\TestFlightCore.dll.mdb" />

‎custom.targets‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<ItemGroup>
3-
<FilesToCopy Include="$(OutputPath)\TestFlight.dll" />
4-
</ItemGroup>
5-
<ItemGroup>
6-
<MDBFilesToCopy Include="$(OutputPath)\TestFlight.dll.mdb" />
3+
<FilesToCopy Include="$(OutputPath)\TestFlight.*" />
74
</ItemGroup>
85
<Target Name="AfterBuild">
96
<Copy SourceFiles="@(FilesToCopy)" DestinationFolder=".\GameData\TestFlight\Plugins\" />

0 commit comments

Comments
 (0)