diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2011-06-28 14:08:01 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2011-06-28 14:08:17 +0400 |
| commit | fae181e35931376c06ba123893d56447c6c9ca1d (patch) | |
| tree | c1b03e5b196b529486e9862863686cbb9e695d7d /setup | |
| parent | e26eb7f06ba442468e8431813d4621d726f83a31 (diff) | |
Fixed setup on windows 7.
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/WixSetup/Product.wxs | 1 | ||||
| -rw-r--r-- | setup/WixSetup/build.js | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/setup/WixSetup/Product.wxs b/setup/WixSetup/Product.wxs index 0506b0dd8f..b12a70412a 100644 --- a/setup/WixSetup/Product.wxs +++ b/setup/WixSetup/Product.wxs @@ -51,7 +51,6 @@ <File Name="mdmonitor.exe" Source="$(var.BuildRoot)\bin\mdmonitor.exe" />
<File Name="Mono.Cecil.dll" Source="$(var.BuildRoot)\bin\Mono.Cecil.dll" />
<File Name="Mono.Cecil.Mdb.dll" Source="$(var.BuildRoot)\bin\Mono.Cecil.Mdb.dll" />
- <File Name="Cecil.Decompiler.dll" Source="$(var.BuildRoot)\bin\Cecil.Decompiler.dll" />
<File Name="Mono.Debugging.dll" Source="$(var.BuildRoot)\bin\Mono.Debugging.dll" />
<File Name="Mono.TextEditor.dll" Source="$(var.BuildRoot)\bin\Mono.TextEditor.dll" />
<File Name="MonoDevelop.Core.dll" Source="$(var.BuildRoot)\bin\MonoDevelop.Core.dll" />
diff --git a/setup/WixSetup/build.js b/setup/WixSetup/build.js index 0fc8be30dc..2af106c452 100644 --- a/setup/WixSetup/build.js +++ b/setup/WixSetup/build.js @@ -12,7 +12,14 @@ var ASSEMBLY_BUILD_VERSION = 0; var sh = new ActiveXObject("WScript.Shell");
var fs = new ActiveXObject("Scripting.FileSystemObject");
-var MONO_LIBS = "C:\\Program Files\\MonoLibraries\\2.6";
+var MONO_LIBS = sh.ExpandEnvironmentStrings("%ProgramFiles(x86)%") + "\\MonoLibraries\\2.6";
+if (!fs.FolderExists (MONO_LIBS))
+ MONO_LIBS = sh.ExpandEnvironmentStrings("%ProgramFiles%") + "\\MonoLibraries\\2.6";
+if (!fs.FolderExists (MONO_LIBS)) {
+ WScript.Echo ("Mono libraries folder not found.\nGet latest from http://software.xamarin.com/files/MonoLibraries.msi");
+ WScript.Quit (1);
+}
+
var MD_DIR = "..\\..";
var MD_EXTRAS_DIR = "..\\..\\extras";
var PRODUCT_VERSION = "" + MAJOR_VERSION + "." + MINOR_VERSION + "." + POINT_VERSION + (BUILD_VERSION != 0 ? "." + BUILD_VERSION : "");
@@ -75,7 +82,7 @@ WScript.Echo ("Setup successfully generated"); function build (file)
{
if (sh.run ("C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe " + MD_DIR + "\\" + file, 5, true) != 0) {
- WScript.Echo ("Build failed");
+ WScript.Echo ("Build failed.\nCommand:\nC:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe " + MD_DIR + "\\" + file);
return 1;
}
return 0;
|