Skip to content

Commit

Permalink
Drop KSP 1.3 support
Browse files Browse the repository at this point in the history
  • Loading branch information
steamport committed Mar 31, 2019
1 parent cf02144 commit c548881
Show file tree
Hide file tree
Showing 19 changed files with 3,440 additions and 3,511 deletions.
54 changes: 27 additions & 27 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
language: csharp
env:
global:
- ZIP_PASSWORD="gQn337XZBEFxzFuVwzKgc27ehZo7XLz485hh3erqF9"
matrix:
include:
- env:
- KSPVERS="1.6.1 1.5.1 1.4.5 1.3.1"
- KSPBINS="16 15 14 13"
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq p7zip-full bash openssh-client jq
script:
- cd "$TRAVIS_BUILD_DIR"
- bash "$TRAVIS_BUILD_DIR/buildscripts/Travis/build.sh"
after_success:
- export MOD_VERSION=$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.MAJOR').$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.MINOR').$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.PATCH')
- bash "$TRAVIS_BUILD_DIR/buildscripts/Travis/avc_version.sh" $PRIMARY_KSPVER "$TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/GameData"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/LICENSE"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/CHANGELOG.md"
- echo "${SFTP_KEY}" | base64 --decode >/tmp/sftp_key
- chmod 400 /tmp/sftp_key
- ssh-keyscan -p ${SFTP_PORT} -H ${SFTP_TARGET} >> ~/.ssh/known_hosts
- sftp -i /tmp/sftp_key -P ${SFTP_PORT} ${SFTP_USER}@${SFTP_TARGET}:${SFTP_DIR} <<< "put \"Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip\""
notifications:
email: false
language: csharp
env:
global:
- ZIP_PASSWORD="gQn337XZBEFxzFuVwzKgc27ehZo7XLz485hh3erqF9"
matrix:
include:
- env:
- KSPVERS="1.6.1 1.5.1 1.4.5"
- KSPBINS="16 15 14"
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq p7zip-full bash openssh-client jq
script:
- cd "$TRAVIS_BUILD_DIR"
- bash "$TRAVIS_BUILD_DIR/buildscripts/Travis/build.sh"
after_success:
- export MOD_VERSION=$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.MAJOR').$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.MINOR').$(cat $TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version | jq '.VERSION.PATCH')
- bash "$TRAVIS_BUILD_DIR/buildscripts/Travis/avc_version.sh" $PRIMARY_KSPVER "$TRAVIS_BUILD_DIR/GameData/Kerbalism/Kerbalism.version"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/GameData"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/LICENSE"
- 7za a "$TRAVIS_BUILD_DIR/Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip" "$TRAVIS_BUILD_DIR/CHANGELOG.md"
- echo "${SFTP_KEY}" | base64 --decode >/tmp/sftp_key
- chmod 400 /tmp/sftp_key
- ssh-keyscan -p ${SFTP_PORT} -H ${SFTP_TARGET} >> ~/.ssh/known_hosts
- sftp -i /tmp/sftp_key -P ${SFTP_PORT} ${SFTP_USER}@${SFTP_TARGET}:${SFTP_DIR} <<< "put \"Kerbalism-$MOD_VERSION-BUILD$TRAVIS_BUILD_NUMBER.zip\""
notifications:
email: false
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.2.0 for all versions of KSP from 1.3.1 to 1.6.x
## v2.2.0 for all versions of KSP from 1.4.0 to 1.6.x

- 2019-03-31

Expand Down
2 changes: 1 addition & 1 deletion GameData/Kerbalism/Kerbalism.version
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"CHANGE_LOG_URL": "https://spacedock.info/mod/1774/Kerbalism",
"VERSION": {"MAJOR": 2, "MINOR": 2, "PATCH": 0, "BUILD": 0},
"KSP_VERSION": {"MAJOR": 1, "MINOR": 6, "PATCH": 1},
"KSP_VERSION_MIN": {"MAJOR": 1, "MINOR": 3, "PATCH": 1},
"KSP_VERSION_MIN": {"MAJOR": 1, "MINOR": 4, "PATCH": 0},
"KSP_VERSION_MAX": {"MAJOR": 1, "MINOR": 6, "PATCH": 99}
}
Binary file removed GameData/Kerbalism/Kerbalism13.bin
Binary file not shown.
Binary file removed GameData/Kerbalism/Kerbalism13.bin.gpg
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism14.bin
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism14.bin.gpg
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism15.bin
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism15.bin.gpg
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism16.bin
Binary file not shown.
Binary file modified GameData/Kerbalism/Kerbalism16.bin.gpg
Binary file not shown.
Binary file modified GameData/Kerbalism/KerbalismBootstrap.dll.gpg
Binary file not shown.
4 changes: 2 additions & 2 deletions buildscripts/Travis/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
export KSPVERS=${KSPVERS:-"1.6.1 1.5.1 1.4.5 1.3.1"}
export KSPBINS=${KSPBINS:-"16 15 14 13"}
export KSPVERS=${KSPVERS:-"1.6.1 1.5.1 1.4.5"}
export KSPBINS=${KSPBINS:-"16 15 14"}
export TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR:-$PWD}
IFS=' ' read -r -a _KSPVERS <<< "$KSPVERS"
IFS=' ' read -r -a _KSPBINS <<< "$KSPBINS"
Expand Down
4 changes: 0 additions & 4 deletions src/Kerbalism/External/ModuleManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ public static class ModuleManager
{
public static int MM_major;
public static int MM_minor;
#if !KSP13
public static int MM_rev;
#endif
static ModuleManager()
{
foreach (var a in AssemblyLoader.loadedAssemblies)
Expand All @@ -19,9 +17,7 @@ static ModuleManager()
Version v = a.assembly.GetName().Version;
MM_major = v.Major;
MM_minor = v.Minor;
#if !KSP13
MM_rev = v.Revision;
#endif
break;
}
}
Expand Down
36 changes: 0 additions & 36 deletions src/Kerbalism/Kerbalism.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,40 +53,6 @@
<NoWarn>IDE0018</NoWarn>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug 1.3|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath Condition="Exists('$(KSPBACKPORTDIR)\GameData\Kerbalism\')">$(KSPBACKPORTDIR)\GameData\Kerbalism\</OutputPath>
<OutputPath Condition="!Exists('$(KSPBACKPORTDIR)\GameData\Kerbalism\')">..\13\obj\Kerbalism\</OutputPath>
<DefineConstants>TRACE;DEBUG;KSP13;DEVELOPMENT;ENABLE_PROFILER;DEBUG_PROFILER</DefineConstants>
<NoWarn>IDE0018</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<WarningLevel>3</WarningLevel>
<StartAction>Program</StartAction>
<StartProgram>$(KSPBACKPORTDIR)\KSP_x64_Dbg.exe</StartProgram>
<StartWorkingDirectory>$(KSPBACKPORTDIR)</StartWorkingDirectory>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release 1.3|AnyCPU'">
<OutputPath Condition="Exists('$(KSPBACKPORTDIR)\GameData\Kerbalism\')">$(KSPBACKPORTDIR)\GameData\Kerbalism\</OutputPath>
<OutputPath Condition="!Exists('$(KSPBACKPORTDIR)\GameData\Kerbalism\')">..\13\obj\Kerbalism\</OutputPath>
<Optimize>true</Optimize>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>IDE0018</NoWarn>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>latest</LangVersion>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<DefineConstants>KSP13</DefineConstants>
<GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
<StartAction>Program</StartAction>
<StartProgram>$(KSPBACKPORTDIR)\KSP_x64.exe</StartProgram>
<StartWorkingDirectory>$(KSPBACKPORTDIR)</StartWorkingDirectory>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
</PropertyGroup>
<Choose>
<When Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Debug'">
<ItemGroup>
Expand Down Expand Up @@ -334,8 +300,6 @@
</PostBuildEventDependsOn>
<PostBuildEvent Condition="'$(OS)' == 'Windows_NT'">if "$(ConfigurationName)"=="Debug" (call "$(ProjectDir)..\..\buildscripts\UnityDebug\prepare-debug.bat" $(TargetName) 16)
if "$(ConfigurationName)"=="Release" (call "$(ProjectDir)..\..\buildscripts\ZipPack\build-package.bat" $(TargetName) -v@(VersionNumber) 16)
if "$(ConfigurationName)"=="Debug 1.3" (call "$(ProjectDir)..\..\buildscripts\UnityDebug\prepare-debug.bat" $(TargetName) 13)
if "$(ConfigurationName)"=="Release 1.3" (call "$(ProjectDir)..\..\buildscripts\ZipPack\build-package.bat" $(TargetName) -v@(VersionNumber) 13)
echo Copying local repository Localization files to $(TargetDir)Localization
xcopy /E /D /Y "$(ProjectDir)..\..\GameData\Kerbalism\Localization" "$(TargetDir)\Localization\"
</PostBuildEvent>
Expand Down

0 comments on commit c548881

Please sign in to comment.