2003-10-07 Bernie Solomon <bernard@ugsolutions.com>

	* mono/scripts/Makefile.am mono/scripts/*.in: fix
	managed .exe paths so they are found under cygwin.

svn path=/trunk/mono/; revision=18714

diff --git a/ChangeLog b/ChangeLog
index 83b08f5a79de1ac96527d4d3f79c32edb6ece79c..7de8446d2c2c52136c61de889e912f77edbeb75e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-07  Bernie Solomon  <bernard@ugsolutions.com>
+
+       * mono/scripts/Makefile.am mono/scripts/*.in: fix
+       managed .exe paths so they are found under cygwin.
+
 2003-10-07  Zoltan Varga  <vargaz@freemail.hu>
 
        * mono/tests/pinvoke2.cs mono/tests/libtest.c: Fix array of structs

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 925429f479dabe0c304a7357af9d3ec74c4b3a7e..3f711454c0298e33b914348a65bd8a0cfa2234c5 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -10,51 +10,57 @@ else
 MONO_INTERP = mint
 endif
 
+if PLATFORM_WIN32
+plat_bindir = $(shell cygpath -m $(bindir))
+else
+plat_bindir = $(bindir)
+endif
+
 mcs: mcs.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/mcs.in > mcs.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mcs.in > mcs.tmp \
        && mv mcs.tmp mcs 
         
 mbas: mbas.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/mbas.in > mbas.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mbas.in > mbas.tmp \
        && mv mbas.tmp mbas 
 
 ilasm: ilasm.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/ilasm.in > ilasm.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/ilasm.in > ilasm.tmp \
        && mv ilasm.tmp ilasm
 
 cilc: cilc.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/cilc.in > cilc.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/cilc.in > cilc.tmp \
        && mv cilc.tmp cilc
 
 monoresgen: monoresgen.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/monoresgen.in > monoresgen.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/monoresgen.in > monoresgen.tmp \
        && mv monoresgen.tmp monoresgen
 
 secutil: secutil.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/secutil.in > secutil.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/secutil.in > secutil.tmp \
        && mv secutil.tmp secutil
 
 sqlsharp: sqlsharp.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/sqlsharp.in > sqlsharp.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/sqlsharp.in > sqlsharp.tmp \
        && mv sqlsharp.tmp sqlsharp
 
 xsd: xsd.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/xsd.in > xsd.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/xsd.in > xsd.tmp \
        && mv xsd.tmp xsd
 
 wsdl: wsdl.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/wsdl.in > wsdl.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/wsdl.in > wsdl.tmp \
        && mv wsdl.tmp wsdl
 
 genxs: genxs.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/genxs.in > genxs.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/genxs.in > genxs.tmp \
        && mv genxs.tmp genxs
 
 chktrust: chktrust.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/chktrust.in > chktrust.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/chktrust.in > chktrust.tmp \
        && mv chktrust.tmp chktrust
 
 signcode: signcode.in
-       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' < $(srcdir)/signcode.in > signcode.tmp \
+       sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/signcode.in > signcode.tmp \
        && mv signcode.tmp signcode
 

diff --git a/scripts/chktrust.in b/scripts/chktrust.in
index 7ab8a4746c8a2ad14e0dcd514d93613b52fe337a..8c0dc92d5a80c6d0b11ac3abce9a99ad5633be60 100644 (file)
--- a/scripts/chktrust.in
+++ b/scripts/chktrust.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/chktrust.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/chktrust.exe "$@"

diff --git a/scripts/cilc.in b/scripts/cilc.in
index 556225957bc396ee8e67bf01f69fec2bf25496ec..29b4b3f785797f32ee8d953ada2f9d0a424f19e7 100644 (file)
--- a/scripts/cilc.in
+++ b/scripts/cilc.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/cilc.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/cilc.exe "$@"

diff --git a/scripts/genxs.in b/scripts/genxs.in
index 02810e54dd64fff42bb1ab38765f8672d9fea415..7be4d1a48a7e4c5d2540b861cb05fbc0925e6428 100644 (file)
--- a/scripts/genxs.in
+++ b/scripts/genxs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/genxs.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/genxs.exe "$@"

diff --git a/scripts/ilasm.in b/scripts/ilasm.in
index 8ddb393d606b9913e0838d6d4807b91cfb95c22c..fbdf10d79a3fad968a49aa0f6e95882c698c527f 100644 (file)
--- a/scripts/ilasm.in
+++ b/scripts/ilasm.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/ilasm.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/ilasm.exe "$@"

diff --git a/scripts/mbas.in b/scripts/mbas.in
index 92509b62e93a28dd71134476d7c0089ef80ba182..47351d9377247345dac211a3b53fd74bbf00690a 100644 (file)
--- a/scripts/mbas.in
+++ b/scripts/mbas.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/mbas.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/mbas.exe "$@"

diff --git a/scripts/mcs.in b/scripts/mcs.in
index 87f82dfeee1f084cabe58c975fcd2e1968bbbef9..f6ac5029db7e79e80c09b8a272440abcb5c44a7a 100644 (file)
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/mcs.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/mcs.exe "$@"

diff --git a/scripts/monoresgen.in b/scripts/monoresgen.in
index d662ae9a7e3a35da1c7b966124dfaeb63a96bfb1..6e0adb6e26ce2470b6940cc49ddc197d0a6381d3 100644 (file)
--- a/scripts/monoresgen.in
+++ b/scripts/monoresgen.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/monoresgen.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/monoresgen.exe "$@"

diff --git a/scripts/secutil.in b/scripts/secutil.in
index 6be34b9cec0c81517078b10a30215f87bf744327..21edd42a8694fe42ea79e7b4459446f94b2453e3 100644 (file)
--- a/scripts/secutil.in
+++ b/scripts/secutil.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/secutil.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/secutil.exe "$@"

diff --git a/scripts/signcode.in b/scripts/signcode.in
index 5ea5ced12106a0bbd2ad651db2dfe4364dfaeb50..b9db339934ff49c26ef6ec6ee9e1d781c8ab5e0b 100644 (file)
--- a/scripts/signcode.in
+++ b/scripts/signcode.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/signcode.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/signcode.exe "$@"

diff --git a/scripts/sqlsharp.in b/scripts/sqlsharp.in
index 7c652fd403d7dd8d17f57c403e6118a4670b2ea1..e75bee815d40167aeb174b803aa6c5910665690a 100644 (file)
--- a/scripts/sqlsharp.in
+++ b/scripts/sqlsharp.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/sqlsharp.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/sqlsharp.exe "$@"

diff --git a/scripts/wsdl.in b/scripts/wsdl.in
index b8294982ed70b254c2d433059205a65ecc081338..c54820cad8129d59d09b0058be25323802796219 100644 (file)
--- a/scripts/wsdl.in
+++ b/scripts/wsdl.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/wsdl.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/wsdl.exe "$@"

diff --git a/scripts/xsd.in b/scripts/xsd.in
index 1e627d957af91b5b666259057aca071e8f540b1d..05b4b92bad4c07da6ef33fc8009009925b48fea4 100644 (file)
--- a/scripts/xsd.in
+++ b/scripts/xsd.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/@mono_interp@ @bindir@/xsd.exe "$@"
+@bindir@/@mono_interp@ @plat_bindir@/xsd.exe "$@"