Browse Source

Update setup solution and project to use MSBuild 4.0 so it can be built inside SharpDevelop 4.0.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5865 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Matt Ward 15 years ago
parent
commit
6261fba028
  1. 6
      src/Setup/SharpDevelop.Setup.sln
  2. 4
      src/Setup/SharpDevelop.Setup.wixproj
  3. 4
      src/Setup/SharpDevelop.Setup.wixproj.user
  4. 2
      src/Setup/SharpDevelop.Setup.wixproj.user.template
  5. 2
      src/Setup/buildSetup.bat

6
src/Setup/SharpDevelop.Setup.sln

@ -1,5 +1,7 @@ @@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# SharpDevelop 2.1.0.1668

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
# SharpDevelop 4.0.0.5860
Project("{CFEE4113-1246-4D54-95CB-156813CB8593}") = "SharpDevelop.Setup", "SharpDevelop.Setup.wixproj", "{FFC0F136-2F91-4F2E-8D8B-DD435F01A7E6}"
EndProject
Global

4
src/Setup/SharpDevelop.Setup.wixproj

@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<OutputType>Package</OutputType>
<WixToolPath Condition=" '$(WixToolPath)' == '' ">$(SharpDevelopBinPath)\Tools\Wix</WixToolPath>
@ -13,6 +14,7 @@ @@ -13,6 +14,7 @@
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<SuppressIces>ICE45;ICE69</SuppressIces>
<WixVariables>WixUIDialogBmp=Bitmaps\dlgbmp.bmp;WixUILicenseRtf=License.rtf</WixVariables>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<BaseOutputPath>obj\</BaseOutputPath>

4
src/Setup/SharpDevelop.Setup.wixproj.user

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<SetupProductBuildVersion>4289</SetupProductBuildVersion>
<SetupProductBuildVersion>1</SetupProductBuildVersion>
<DefineConstants>PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>
</PropertyGroup>
</Project>

2
src/Setup/SharpDevelop.Setup.wixproj.user.template

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<SetupProductBuildVersion>$INSERTPRODUCTBUILDVERSION$</SetupProductBuildVersion>
<DefineConstants>PRODUCTBUILDVERSION=$(SetupProductBuildVersion)</DefineConstants>

2
src/Setup/buildSetup.bat

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
del "bin\SharpDevelop.msi"
"..\Tools\UpdateSetupInfo\bin\UpdateSetupInfo.exe"
%windir%\microsoft.net\framework\v2.0.50727\msbuild SharpDevelop.Setup.sln "/p:SharpDevelopBinPath=%CD%\..\..\bin"
%windir%\microsoft.net\framework\v4.0.30319\msbuild SharpDevelop.Setup.sln "/p:SharpDevelopBinPath=%CD%\..\..\bin"
@IF %ERRORLEVEL% NEQ 0 PAUSE
Loading…
Cancel
Save