Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
SirMortimer committed Nov 5, 2019
2 parents af69c1c + 8791b4c commit 155d2b0
Show file tree
Hide file tree
Showing 456 changed files with 24,146 additions and 15,001 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

.gitattributes text eol=crlf
*.sln text eol=crlf
*.xml text eol=crlf
*.csproj text eol=crlf
*.vbproj text eol=crlf
*.vcxproj text eol=crlf
Expand All @@ -39,7 +40,9 @@
#*.cfg text eol=crlf NOPE



#*.sln merge=binary
#*.xml merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
Expand Down
18 changes: 16 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -382,8 +382,22 @@ docs/_[Bb]uild
# SciTE editor config files
SciTE*.properties

# Kerbalism build system
# Old Kerbalism build system
src/DLLs
KSP-*.7z
Kerbalism-Core*.zip
Kerbalism-Config*.zip
Kerbalism-Config*.zip

# New Kerbalism build system
# UserConfigRelease.xml can contain sensitive information.
# It is git-ignored by it is highly recommended to put it
# outside the repository as an additional security
UserConfigRelease.xml
BuildSystem/UserConfigDevEnv.xml
BuildSystem/DeploymentOutput
BuildSystem/BinariesDebug
BuildSystem/BinariesRelease
BuildSystem/References/KSPReferenceDlls
!BuildSystem/References/KSPReferenceZips/KSP-*.7z


25 changes: 0 additions & 25 deletions .travis.yml

This file was deleted.

867 changes: 867 additions & 0 deletions BuildSystem/BuildSystemTargets.xml

Large diffs are not rendered by default.

File renamed without changes.
41 changes: 41 additions & 0 deletions BuildSystem/ProjectsCommonProperties.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- /////////////////////////////////////////////////// -->
<!-- //////// COMMON PROPERTIES FOR ALL PROJECTS /////// -->
<!-- /////////////////////////////////////////////////// -->

<!--
Note : all paths defined here are also defined in the "BuildSystemTargets.xml" file
This file is intended to be imported from the *.csproj files, we can't import
"BuildSystemTargets.xml" in the project files because :
1. It create a circular reference
1. The relative "RepoBasePath" is different for the build system and the projects
To differentiate the properties defined here, they are suffixed with "PR"
-->

<PropertyGroup>
<!-- We use up to C# version 7.1 (Visual Studio 2017 is required) -->
<LangVersion>7.1</LangVersion>

<!-- Always target x64 -->
<PlatformTarget>x64</PlatformTarget>

<!-- Repository base path (relative to the *.csproj files)-->
<RepoBasePathPR>..\..</RepoBasePathPR>

<!-- Binaries output path (those are MSBuild standard properties, so not suffixed) -->
<OutputPath Condition="$(Configuration)==Debug" >$(RepoBasePathPR)\BuildSystem\BinariesDebug</OutputPath>
<OutputPath Condition="$(Configuration)==Release" >$(RepoBasePathPR)\BuildSystem\BinariesRelease</OutputPath>
<IntermediateOutputPath>$(OutputPath)\obj</IntermediateOutputPath>

<!-- Reference paths-->
<KSPReferenceDllsPathPR>$(RepoBasePathPR)\BuildSystem\References\KSPReferenceDlls</KSPReferenceDllsPathPR>

<!-- GameData paths-->
<GameDataKerbalismPathPR>$(RepoBasePathPR)\GameData\Kerbalism</GameDataKerbalismPathPR>
<GameDataKerbalismConfigPathPR>$(RepoBasePathPR)\GameData\KerbalismConfig</GameDataKerbalismConfigPathPR>

</PropertyGroup>
</Project>

0 comments on commit 155d2b0

Please sign in to comment.