In .:

[mono.git] / mcs / class / Managed.Windows.Forms / build-csproj

diff --git a/mcs/class/Managed.Windows.Forms/build-csproj b/mcs/class/Managed.Windows.Forms/build-csproj
index 2eaccfd22391ce9384dd402d2e42d8e89f896b25..abfee61e41859dd36716d41e1ecfca9d441540dd 100755 (executable)
--- a/mcs/class/Managed.Windows.Forms/build-csproj
+++ b/mcs/class/Managed.Windows.Forms/build-csproj
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # I got tired of editing the SWF.csproj
 # This script will generate it from our System.Windows.Forms.dll.sources
@@ -43,7 +43,7 @@ cat << EOT
                     BaseAddress = "285212672"
                     CheckForOverflowUnderflow = "false"
                     ConfigurationOverrideFile = ""
-                    DefineConstants = "NET_1_1"
+                    DefineConstants = "NET_1_1 ONLY_1_1"
                     DocumentationFile = ""
                     DebugSymbols = "true"
                     FileAlignment = "4096"
@@ -83,7 +83,7 @@ cat << EOT
                     BaseAddress = "285212672"
                     CheckForOverflowUnderflow = "false"
                     ConfigurationOverrideFile = ""
-                    DefineConstants = "NET_1_1"
+                    DefineConstants = "NET_1_1 ONLY_1_1"
                     DocumentationFile = ""
                     DebugSymbols = "false"
                     FileAlignment = "4096"
@@ -176,10 +176,8 @@ done
 SWFresourcelist()
 {
 cat $Resource | 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 | $tr '/' '\\\\'`
-SRC=`echo $SRC | $tr '/' '\\\\' | sed 's/-resource://' | awk -F , '{print "                    RelPath = \"" $1 "\"\n                    CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
+SRC=`echo $SRC | sed 's/-resource://' | gawk -F , '{print "                    RelPath = \"" $1 "\"\n                    CustomToolNameSpace = \"" $2 "\""}' | fgrep -v \"\"`
 
 cat << EOT
                 <File
@@ -187,7 +185,6 @@ $SRC
                     BuildAction = "EmbeddedResource"
                 />
 EOT
-fi
 done
 }
 
@@ -196,13 +193,13 @@ SWFtail()
 cat << EOT
                 <File
                     RelPath = "Consts.cs"
-                    Link = "../../build/common/Consts.cs"
+                    Link = "common/Consts.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />
                 <File
                     RelPath = "MonoTODOAttribute.cs"
-                    Link = "../../build/common/MonoTODOAttribute.cs"
+                    Link = "common/MonoTODOAttribute.cs"
                     SubType = "Code"
                     BuildAction = "Compile"
                 />