Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8f5b4cddbede
Choose a base ref
...
head repository: Kopernicus/Kopernicus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 973d7638beb7
Choose a head ref
  • 2 commits
  • 9 files changed
  • 1 contributor

Commits on Oct 15, 2018

  1. Compile against 1.5.0

    @StollD
    StollD committed Oct 15, 2018
    Copy the full SHA
    75d65ac View commit details

  2. More work on the backport system

    @StollD
    StollD committed Oct 15, 2018
    Copy the full SHA
    973d763 View commit details
8 changes: 4 additions & 4 deletions src/Kopernicus.Components/Kopernicus.Components.csproj
View file
Original file line number Diff line number Diff line change
@@ -32,11 +32,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\Assembly-CSharp.1.4.5\lib\net35\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\packages\Assembly-CSharp.1.5.0\lib\net35\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ModularFlightIntegrator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\ModularFlightIntegrator.1.2.5.2\lib\net35\ModularFlightIntegrator.dll</HintPath>
<HintPath>..\..\packages\ModularFlightIntegrator.1.2.5.3\lib\net35\ModularFlightIntegrator.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
@@ -46,11 +46,11 @@
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.1.4.5\lib\net35\UnityEngine.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.1.5.0\lib\net35\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.UI.1.4.5\lib\net35\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.UI.1.5.0\lib\net35\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
8 changes: 4 additions & 4 deletions src/Kopernicus.Components/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Assembly-CSharp" version="1.4.5" targetFramework="net35" />
<package id="ModularFlightIntegrator" version="1.2.5.2" targetFramework="net35" />
<package id="UnityEngine" version="1.4.5" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.4.5" targetFramework="net35" />
<package id="Assembly-CSharp" version="1.5.0" targetFramework="net35" />
<package id="ModularFlightIntegrator" version="1.2.5.3" targetFramework="net35" />
<package id="UnityEngine" version="1.5.0" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.5.0" targetFramework="net35" />
</packages>
6 changes: 3 additions & 3 deletions src/Kopernicus.OnDemand/Kopernicus.OnDemand.csproj
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\Assembly-CSharp.1.4.5\lib\net35\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\packages\Assembly-CSharp.1.5.0\lib\net35\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
@@ -43,11 +43,11 @@
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.1.4.5\lib\net35\UnityEngine.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.1.5.0\lib\net35\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.UI.1.4.5\lib\net35\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.UI.1.5.0\lib\net35\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
6 changes: 3 additions & 3 deletions src/Kopernicus.OnDemand/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Assembly-CSharp" version="1.4.5" targetFramework="net35" />
<package id="UnityEngine" version="1.4.5" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.4.5" targetFramework="net35" />
<package id="Assembly-CSharp" version="1.5.0" targetFramework="net35" />
<package id="UnityEngine" version="1.5.0" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.5.0" targetFramework="net35" />
</packages>
8 changes: 4 additions & 4 deletions src/Kopernicus/Kopernicus.csproj
View file
Original file line number Diff line number Diff line change
@@ -29,11 +29,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\Assembly-CSharp.1.4.5\lib\net35\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\packages\Assembly-CSharp.1.5.0\lib\net35\Assembly-CSharp.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ModularFlightIntegrator, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\ModularFlightIntegrator.1.2.5.2\lib\net35\ModularFlightIntegrator.dll</HintPath>
<HintPath>..\..\packages\ModularFlightIntegrator.1.2.5.3\lib\net35\ModularFlightIntegrator.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System">
@@ -43,11 +43,11 @@
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.1.4.5\lib\net35\UnityEngine.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.1.5.0\lib\net35\UnityEngine.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
<HintPath>..\..\packages\UnityEngine.UI.1.4.5\lib\net35\UnityEngine.UI.dll</HintPath>
<HintPath>..\..\packages\UnityEngine.UI.1.5.0\lib\net35\UnityEngine.UI.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup>
8 changes: 4 additions & 4 deletions src/Kopernicus/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Assembly-CSharp" version="1.4.5" targetFramework="net35" />
<package id="ModularFlightIntegrator" version="1.2.5.2" targetFramework="net35" />
<package id="UnityEngine" version="1.4.5" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.4.5" targetFramework="net35" />
<package id="Assembly-CSharp" version="1.5.0" targetFramework="net35" />
<package id="ModularFlightIntegrator" version="1.2.5.3" targetFramework="net35" />
<package id="UnityEngine" version="1.5.0" targetFramework="net35" />
<package id="UnityEngine.UI" version="1.5.0" targetFramework="net35" />
</packages>
2 changes: 1 addition & 1 deletion src/external/config-parser
Submodule config-parser updated 2 files
+3 −3 src/Kopernicus.Parser.csproj
+3 −3 src/packages.config
40 changes: 28 additions & 12 deletions tools/backport/apply-patches.sh
View file
Original file line number Diff line number Diff line change
@@ -9,36 +9,52 @@ then
fi

# Download the patches
wget -O backport.zip https://github.com/Kopernicus/Kopernicus-Backport/archive/ksp-$BACKPORT.zip
wget -O backport.zip https://github.com/Kopernicus/Kopernicus-Backport/archive/master.zip
unzip backport.zip
mv Kopernicus-Backport-ksp-$BACKPORT ksp-$BACKPORT
mv Kopernicus-Backport-master backport-master

# Which Kopernicus versions are we working with?
source version
temp=${VERSION//-/.}
numbers=(`echo $temp | sed 's/\./\n/g'`)
BASE="${numbers[0]}.${numbers[1]}.${numbers[2]}"
MFIBASE=$MFI

source backport-master/versions/ksp-$BACKPORT
temp=${VERSION//-/.}
numbers=(`echo $temp | sed 's/\./\n/g'`)
BACKPORT="${numbers[0]}.${numbers[1]}.${numbers[2]}"
MFIBACKPORT=$MFI

# Apply the patches
find ksp-$BACKPORT -path "*.patch" | while read patchfile
find backport-master/patches -path "*.patch" | while read patchfile
do
file=${patchfile#"ksp-$BACKPORT/"}
sed -i "s/{FLAG}/$FLAG/g" $patchfile
sed -i "s/{BACKPORT}/${numbers[0]}.${numbers[1]}.${numbers[2]}/g" $patchfile
sed -i "s/{MFIBACKPORT}/$MFIBACKPORT/g" $patchfile
sed -i "s/{MFIBASE}/$MFIBASE/g" $patchfile
sed -i "s/{BASE}/$BASE/g" $patchfile

file=${patchfile#"backport-master/patches/"}
file=${file%".patch"}
patch -tuf $file $patchfile
done

# Which Kopernicus version is this based on?
source ksp-$BACKPORT/backport.sh

# Clean up the dependencies
rm build/GameData/ModuleManager.*.dll
rm -r build/GameData/ModularFlightIntegrator
rm -r build/GameData/Kopernicus/Shaders

# Download the referenced Kopernicus
wget -O kopernicus.zip https://github.com/Kopernicus/Kopernicus/releases/download/release-$VERSION/Kopernicus-$VERSION.zip
unzip kopernicus.zip -d ksp-$BACKPORT
unzip kopernicus.zip -d backport-master

# Move the new dependencies
cp ksp-$BACKPORT/GameData/ModuleManager.*.dll build/GameData/
cp -r ksp-$BACKPORT/GameData/ModularFlightIntegrator build/GameData/
cp -r ksp-$BACKPORT/GameData/Kopernicus/Shaders build/GameData/Kopernicus
cp backport-master/GameData/ModuleManager.*.dll build/GameData/
cp -r backport-master/GameData/ModularFlightIntegrator build/GameData/
cp -r backport-master/GameData/Kopernicus/Shaders build/GameData/Kopernicus

# Cleanup
rm backport.zip
rm kopernicus.zip
rm -r ksp-$BACKPORT
rm -r backport-master
2 changes: 2 additions & 0 deletions version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VERSION="1.5.0-1"
MFI="1.2.5.3"