Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2018-01-27 23:25:45 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2018-01-28 02:05:33 +0300
commitd9a7a04f05ff77dd1b806178bfaf65e82285d292 (patch)
tree7db854371757f79d931299bcac0300f853212836 /packaging
parent4248d073d6cd68418aefa949e52e4b8ffc464151 (diff)
[packaging] Produce correct Windows .msi file name
We've been using a certain pattern for the Windows .msi for a long time but the build output used a different name which we simply manually renamed before publishing. Since we want to automate as much as possible we can change the build to produce the correct name right away.
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/Windows/defs/gtksharp3
-rw-r--r--packaging/Windows/resources/MonoForWindows.wixproj3
-rwxr-xr-xpackaging/Windows/resources/build.bat1
3 files changed, 5 insertions, 2 deletions
diff --git a/packaging/Windows/defs/gtksharp b/packaging/Windows/defs/gtksharp
index 5ff27b7e79d..727c429c732 100755
--- a/packaging/Windows/defs/gtksharp
+++ b/packaging/Windows/defs/gtksharp
@@ -1,6 +1,7 @@
#!/bin/bash -xe
-REPO="https://dl.xamarin.com/GTKforWindows/Windows/gtk-sharp-2.12.45.msi"
+GTKSHARP_VERSION=2.12.45
+REPO="https://dl.xamarin.com/GTKforWindows/Windows/gtk-sharp-$(GTKSHARP_VERSION).msi"
REPODIR=$(dirname $(realpath $0))/../repos/gtksharp
error()
diff --git a/packaging/Windows/resources/MonoForWindows.wixproj b/packaging/Windows/resources/MonoForWindows.wixproj
index c39e5db55e1..1b52e89967d 100644
--- a/packaging/Windows/resources/MonoForWindows.wixproj
+++ b/packaging/Windows/resources/MonoForWindows.wixproj
@@ -6,7 +6,8 @@
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>9f279b8c-fc0d-49d4-b5bd-ade0db0c3095</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
- <OutputName>MonoForWindows-$(Platform)</OutputName>
+ <OutputName Condition=" '$(Platform)' == 'x86'">mono-$(MONO_VERSION)-gtksharp-$(GTKSHARP_VERSION)-win32-0</OutputName>
+ <OutputName Condition=" '$(Platform)' == 'x64'">mono-$(MONO_VERSION)-x64-0</OutputName>
<OutputType>Package</OutputType>
<SuppressIces>ICE61;</SuppressIces>
<DefineSolutionProperties>false</DefineSolutionProperties>
diff --git a/packaging/Windows/resources/build.bat b/packaging/Windows/resources/build.bat
index 87d7523c0f8..a8bafe39793 100755
--- a/packaging/Windows/resources/build.bat
+++ b/packaging/Windows/resources/build.bat
@@ -1,6 +1,7 @@
@echo off
set MONO_VERSION=X.X.X
+set GTKSHARP_VERSION=X.X.X
set MONO_FILES_DIR=..\tmp\mono
"%windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe" %~dp0\MonoForWindows.wixproj /p:Configuration=Release /p:DefaultCompressionLevel=high