X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FManaged.Windows.Forms%2Fbuild-csproj2k5;h=4e444186a454516e799facb9bba633a98b92e6a6;hb=9f69887d40fdd0dddb590abb08343e2a58158392;hp=eee5c42e020b045dc6147e54f6a0b0baab5a41c3;hpb=80a07b8a71d7ab2f490dd12388b39002a6587d35;p=mono.git

diff --git a/mcs/class/Managed.Windows.Forms/build-csproj2k5 b/mcs/class/Managed.Windows.Forms/build-csproj2k5
index eee5c42e020..4e444186a45 100755
--- a/mcs/class/Managed.Windows.Forms/build-csproj2k5
+++ b/mcs/class/Managed.Windows.Forms/build-csproj2k5
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # This script will generate SWF.cs.target from our System.Windows.Forms.dll.sources
 #
@@ -49,90 +49,94 @@ SWFhead()
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>NET_1_1</DefineConstants>
+    <DefineConstants>NET_1_1 NET_2_0 MWF_ON_MSRUNTIME</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>612,618,3021</NoWarn>
     <Optimize>false</Optimize>
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>1</WarningLevel>
+    <WarningLevel>3</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType> 
+    <AssemblyName>System.Windows.Forms</AssemblyName>     
   </PropertyGroup>
-  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug 2.0|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
+  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>NET_2_0</DefineConstants>
+    <DefineConstants>NET_1_1 NET_2_0 MWF_ON_MSRUNTIME</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
+    <DebugSymbols>false</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>612,618,3021</NoWarn>
     <Optimize>false</Optimize>
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>1</WarningLevel>
-    <DebugType>full</DebugType>
+    <WarningLevel>3</WarningLevel>
+    <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType> 
+    <AssemblyName>System.Windows.Forms</AssemblyName>     
   </PropertyGroup>
-  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
+  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Debug 1.1|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>NET_1_1</DefineConstants>
+    <DefineConstants>NET_1_1 ONLY_1_1 MWF_ON_MSRUNTIME</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
+    <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>612,618,3021</NoWarn>
     <Optimize>false</Optimize>
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>1</WarningLevel>
-    <DebugType>none</DebugType>
+    <WarningLevel>3</WarningLevel>
+    <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType> 
+    <AssemblyName>System.Windows.Forms</AssemblyName>     
   </PropertyGroup>
-  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release 2.0|AnyCPU' ">
+  <PropertyGroup Condition=" '\$(Configuration)|\$(Platform)' == 'Release 1.1|AnyCPU' ">
     <OutputPath>bin\Release\</OutputPath>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile>
     </ConfigurationOverrideFile>
-    <DefineConstants>NET_2_0</DefineConstants>
+    <DefineConstants>NET_1_1 ONLY_1_1 MWF_ON_MSRUNTIME</DefineConstants>
     <DocumentationFile>
     </DocumentationFile>
     <DebugSymbols>false</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
+    <NoWarn>612,618,3021</NoWarn>
     <Optimize>false</Optimize>
     <RegisterForComInterop>false</RegisterForComInterop>
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>1</WarningLevel>
+    <WarningLevel>3</WarningLevel>
     <DebugType>none</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType> 
+    <AssemblyName>System.Windows.Forms</AssemblyName>     
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility">
@@ -141,6 +145,7 @@ SWFhead()
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Include="System.configuration" />
     <Reference Include="System.Data">
       <Name>System.Data</Name>
     </Reference>
@@ -153,7 +158,15 @@ SWFhead()
     <Reference Include="System.Xml">
       <Name>System.Xml</Name>
     </Reference>
-    <Reference Include="Mono.Posix" Condition="'\$(Configuration)' == 'DebugXBuild'"/>
+    <Reference Include="Mono.WebBrowser2K5">
+      <Name>Mono.WebBrowser2K5</Name>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Mono.WebBrowser\Mono.WebBrowser2K5.csproj">
+      <Project>{5E6C996A-007F-40CE-B244-006EFCFB77D2}</Project>
+      <Name>Mono.WebBrowser2K5</Name>
+    </ProjectReference>
   </ItemGroup>
 EOF
 }
@@ -161,6 +174,12 @@ EOF
 SWFtail()
 {
     cat <<EOF
+  <ItemGroup>
+    <None Include="System.Windows.Forms\ChangeLog" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="ChangeLog" />
+  </ItemGroup>
   <Import Project="\$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
@@ -178,6 +197,7 @@ echo "  <ItemGroup>"
 cat $Source | while read SRC; do
 # Don't do AssemblyInfo, it's got signing requests and such that we don't want
 if [ "x$SRC" != "xAssembly/AssemblyInfo.cs" ] ; then
+SRC=`echo $SRC | sed 's/..\/..\/build\///'`
 SRC=`echo $SRC | tr '/' '\\\\'`
 cat <<EOF
     <Compile Include="$SRC" />
@@ -211,9 +231,10 @@ echo "  <ItemGroup>"
 	INCLUDE=`echo $INCLUDE | sed 's/\//\\\\/'`
 
 	echo "    <EmbeddedResource Include=\"$INCLUDE\">"
-	echo "      <LogicalName>$LOGICALNAME</LogicalName>"
 	if test "x$CUSTOMTOOLNAMESPACE" != "x"; then
-	    echo "      <CustomToolNameSpace>$CUSTOMTOOLNAMESPACE</CustomToolNameSpace>"
+		echo "      <LogicalName>$CUSTOMTOOLNAMESPACE</LogicalName>"
+	else
+		echo "      <LogicalName>$LOGICALNAME</LogicalName>"
 	fi
 	echo "    </EmbeddedResource>"
     done