diff options
| author | Michael Hutchinson <mhutch@xamarin.com> | 2013-09-08 05:52:51 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutch@xamarin.com> | 2013-09-08 05:52:51 +0400 |
| commit | 0c5847e99755004433a31b99e2858f829e24f06e (patch) | |
| tree | 372ddd915dfc45f2a9d62e60e586697b11d9669e /setup | |
| parent | 71761efcffee3eca8da5255f95904ad94b3daf19 (diff) | |
Update Win32 build scripts
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/WixSetup/Product.wxs | 12 | ||||
| -rw-r--r-- | setup/WixSetup/build.js | 4 |
2 files changed, 10 insertions, 6 deletions
diff --git a/setup/WixSetup/Product.wxs b/setup/WixSetup/Product.wxs index 363885351a..aae1d42039 100644 --- a/setup/WixSetup/Product.wxs +++ b/setup/WixSetup/Product.wxs @@ -438,9 +438,14 @@ <Directory Id="MonoDevelop.Debugger" Name="MonoDevelop.Debugger">
<Component Id="MonoDevelop_AddIns_MonoDevelop_Debugger" Guid="81b0e56f-9881-4b59-9c69-4ba48380b6d1">
<File Name="MonoDevelop.Debugger.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.dll" />
- <File Name="CorApi.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger\CorApi.dll" />
- <File Name="CorApi2.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger\CorApi2.dll" />
- <File Name="MonoDevelop.Debugger.Win32.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.Win32.dll" />
+ </Component>
+ </Directory>
+ <Directory Id="MonoDevelop.Debugger.Win32" Name="MonoDevelop.Debugger.Win32">
+ <Component Id="MonoDevelop_AddIns_MonoDevelop_Debugger_Win32" Guid="dab2fc46-f5e2-411d-b86a-5cc8e625b737">
+ <File Name="MonoDevelop.Debugger.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger\MonoDevelop.Debugger.dll" />
+ <File Name="CorApi.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger.Win32\CorApi.dll" />
+ <File Name="CorApi2.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger.Win32\CorApi2.dll" />
+ <File Name="MonoDevelop.Debugger.Win32.dll" Source="$(var.BuildRoot)\AddIns\MonoDevelop.Debugger.Win32\MonoDevelop.Debugger.Win32.dll" />
</Component>
</Directory>
<Directory Id="MonoDevelop.Debugger.Soft" Name="MonoDevelop.Debugger.Soft">
@@ -695,6 +700,7 @@ <ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_Autotools" />
<ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_CodeMetrics" />
<ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_Debugger" />
+ <ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_Debugger_Win32" />
<ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_Debugger_Soft" />
<ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_Deployment" />
<ComponentRef Id="MonoDevelop_AddIns_MonoDevelop_DesignerSupport" />
diff --git a/setup/WixSetup/build.js b/setup/WixSetup/build.js index 2af106c452..af2c22441f 100644 --- a/setup/WixSetup/build.js +++ b/setup/WixSetup/build.js @@ -28,12 +28,10 @@ var MONO_PRODUCT_VERSION = "" + MAJOR_VERSION + format (MINOR_VERSION, 2) + form // Build the main solution and the windows-specific add-ins
-if (build ("main\\main.sln /p:Configuration=DebugWin32 /p:Platform=\"x86\"") != 0)
+if (build ("main\\main.sln /p:Configuration=DebugWin32 /p:Platform=\"AnyCPU\"") != 0)
WScript.Quit (1);
if (build ("extras\\VersionControl.Subversion.Win32\\VersionControl.Subversion.Win32.sln") != 0)
WScript.Quit(1);
-if (build ("extras\\MonoDevelop.Debugger.Win32\\MonoDevelop.Debugger.Win32.sln") != 0)
- WScript.Quit (1);
// Copy support assemblies
|