From 4a759838ac6fca3ab25834396206159e263269f0 Mon Sep 17 00:00:00 2001
From: Ted John <ted@brambles.org>
Date: Thu, 25 Aug 2016 19:18:45 +0100
Subject: [PATCH] Prepare msbuild project for AppVeyor

---
 appveyor.yml     | 19 ++++++++++++-------
 openrct2.proj    | 17 +++++++++++++++--
 openrct2.vcxproj |  8 ++++----
 3 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3fb469b0eb..96850fe377 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,18 +7,23 @@ cache:
 environment:
   ENCKEY:
     secure: saYAIpqXzpq0U+JH+MNi/isRQ6Y51PZhm4BrnePDiAPptFO5htxFOLegrYqxdy67
-  CODE-SIGN-KEY-OPENRCT2.ORG.PFX.PASSWORD:
+  SIGN_PASSWORD:
     secure: bzYmf0ElxisSGyZnIjUOYQ==
-  OPENRCT2.ORG_TOKEN:
+  OPENRCT2_ORG_TOKEN:
     secure: leQX3xCQpmBLGuMqrxjFlzexDt96ypNRMM5TTRVHbGE8PwVg9crgeykLc2BIZU6HDHveJCHqh2cGMdHtHYJYcw==
+  BUILD_SERVER: AppVeyor
+  GIT_TAG: ($APPVEYOR_REPO_TAG_NAME)
+  GIT_BRANCH: $(APPVEYOR_REPO_BRANCH)
+  GIT_COMMIT_SHA1: $(APPVEYOR_REPO_COMMIT)
 install:
 - ps: >-
     .\scripts\ps\appveyor_install.ps1
-build_script:
-- ps: >-
-    .\setenv.ps1
-
-    appveyor_build
+platform:
+  - Win32
+  - x64
+configuration: Release
+build:
+  project: openrct2.proj
 artifacts:
 - path: .\artifacts\openrct2.zip
   name: OpenRCT2-portable
diff --git a/openrct2.proj b/openrct2.proj
index d162040469..e5f5ddfff1 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -5,11 +5,10 @@
        - GIT_TAG
        - GIT_BRANCH
        - GIT_COMMIT_SHA1
-       - GIT_COMMIT_SHA1_SHORT
        - SIGN_PASSWORD
        - OPENRCT2_ORG_TOKEN
   -->
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="All">
   <!-- Import custom build tasks -->
   <Import Project="openrct2.targets" />
 
@@ -20,6 +19,7 @@
     <Version>0.0.5</Version>
 
     <BUILD_SERVER Condition="'$(BUILD_SERVER)'!=''">$(COMPUTERNAME)</BUILD_SERVER>
+    <GIT_COMMIT_SHA1_SHORT Condition="'$(GIT_COMMIT_SHA1)'!=''">$(GIT_COMMIT_SHA1.Substring(0, 7))</GIT_COMMIT_SHA1_SHORT>
 
     <!-- Set dynamic OpenRCT2 #defines -->
     <OPENRCT2_DEFINES Condition="'$(BUILD_SERVER)'!=''">OPENRCT2_BUILD_SERVER="$(BUILD_SERVER)";$(OPENRCT2_DEFINES)</OPENRCT2_DEFINES>
@@ -99,6 +99,14 @@
     <Delete Files="$(PublishInstallerExe)" />
   </Target>
 
+  <Target Name="BeforeBuild">
+    <PropertyGroup>
+      <BuildString Condition="'$(GIT_COMMIT_SHA1_SHORT)'!=''">$(GIT_COMMIT_SHA1_SHORT)</BuildString>
+      <BuildString Condition="'$(GIT_BRANCH)'!=''">$(BuildString) ($(GIT_BRANCH))</BuildString>
+    </PropertyGroup>
+    <Message Condition="'$(BuildString)'!=''" Text="Building $(BuildString)" Importance="high" />
+  </Target>
+
   <!-- Target to build g2.dat containing OpenRCT2 sprites -->
   <Target Name="g2" DependsOnTargets="Build" Inputs="@(g2Inputs)" Outputs="$(g2Output)">
     <Message Text="Building g2.dat..." />
@@ -198,4 +206,9 @@
           CustomErrorRegularExpression="&quot;error&quot;:1" />
   </Target>
 
+  <Target Name="All">
+    <CallTarget Condition="'$(OPENRCT2_ORG_TOKEN)'==''" Targets="PublishAll" />
+    <CallTarget Condition="'$(OPENRCT2_ORG_TOKEN)'!=''" Targets="UploadArtifacts" />
+  </Target>
+
 </Project>
diff --git a/openrct2.vcxproj b/openrct2.vcxproj
index 362a44cd55..d448e7315a 100644
--- a/openrct2.vcxproj
+++ b/openrct2.vcxproj
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build0;Build;g2" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="Build0">
-    <Copy SourceFiles="openrct2.exe" DestinationFolder="$(OutDir)" />
-    <Copy SourceFiles="curl-ca-bundle.crt" DestinationFolder="$(OutDir)" />
+<Project InitialTargets="BeforeBuild;CopyOuputFiles" DefaultTargets="Build;g2" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="CopyOuputFiles">
+    <Copy Condition="'$(Platform)'=='Win32'" SourceFiles="openrct2.exe" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="curl-ca-bundle.crt" DestinationFolder="$(TargetDir)" SkipUnchangedFiles="true" />
   </Target>
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">