More efficient script generation, borrowed from xsp/script directory

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

28 files changed, 13 insertions, 85 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3640c52a365..ac3df498486 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,8 +1,12 @@
 EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in sqlsharp.in xsd.in wsdl2.in wsdl.in genxs.in soapsuds.in chktrust.in signcode.in disco.in sn.in al.in cert2spc.in setreg.in makecert.in certmgr.in monop.in gacutil.in gmcs.in mono-find-provides.in mono-find-requires.in
 
-bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl wsdl2 al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
+bin2dir = $(bindir)
 
-CLEANFILES = $(bin_SCRIPTS)
+bin_SCRIPTS = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil mono-find-requires mono-find-provides
+
+bin2_SCRIPTS = gmcs wsdl2
+
+CLEANFILES = $(bin_SCRIPTS) $(bin2_SCRIPTS)
 
 if USE_JIT
 MONO_INTERP = mono
@@ -26,36 +30,14 @@ REWRITE = sed \
 	-e 's,@''mono_one_instdir@,$(mono_one_instdir),g'	\
 	-e 's,@''mono_two_instdir@,$(mono_two_instdir),g'	\
 	-e 's,@''gtkdir@,$(gtkdir),g'				\
+	-e 's,@''exe_file@,$@.exe,g'				\
 	-e 's,@''mono_interp@,$(MONO_INTERP),g'
 
-$(bin_SCRIPTS): Makefile.am
-	$(REWRITE) $(srcdir)/$@.in > $@.tmp
+$(bin_SCRIPTS): script.in Makefile.am
+	$(REWRITE) $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@
+
+$(bin2_SCRIPTS): script2.in Makefile.am
+	$(REWRITE) $(srcdir)/script2.in > $@.tmp
 	mv $@.tmp $@
 
-mcs: mcs.in
-gmcs: gmcs.in
-mbas: mbas.in
-ilasm: ilasm.in
-cilc: cilc.in
-monoresgen: monoresgen.in
-resgen: resgen.in
-secutil: secutil.in
-sqlsharp: sqlsharp.in
-xsd: xsd.in
-wsdl: wsdl.in
-wsdl2: wsdl2.in
-al: al.in
-genxs: genxs.in
-disco: disco.in
-soapsuds: soapsuds.in
-chktrust: chktrust.in
-signcode: signcode.in
-sn: sn.in
-cert2spc: cert2spc.in
-setreg: setreg.in
-makecert: makecert.in
-certmgr: certmgr.in
-monop: monop.in
-gacutil: gacutil.in
-mono-find-provides: mono-find-provides.in
-mono-find-requires: mono-find-requires.in
diff --git a/scripts/al.in b/scripts/al.in
deleted file mode 100644
index 93111b7b698..00000000000
--- a/scripts/al.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/al.exe "$@"
diff --git a/scripts/cert2spc.in b/scripts/cert2spc.in
deleted file mode 100644
index 8440970a022..00000000000
--- a/scripts/cert2spc.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/cert2spc.exe "$@"
diff --git a/scripts/certmgr.in b/scripts/certmgr.in
deleted file mode 100644
index 3ff258c3f5b..00000000000
--- a/scripts/certmgr.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/certmgr.exe "$@"
diff --git a/scripts/chktrust.in b/scripts/chktrust.in
deleted file mode 100644
index ce1f739bc09..00000000000
--- a/scripts/chktrust.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/chktrust.exe "$@"
diff --git a/scripts/cilc.in b/scripts/cilc.in
deleted file mode 100644
index eb76952f4e4..00000000000
--- a/scripts/cilc.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/cilc.exe "$@"
diff --git a/scripts/disco.in b/scripts/disco.in
deleted file mode 100644
index aefd777c996..00000000000
--- a/scripts/disco.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/disco.exe "$@"
diff --git a/scripts/gacutil.in b/scripts/gacutil.in
deleted file mode 100644
index 8672027d566..00000000000
--- a/scripts/gacutil.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/gacutil.exe "$@"
diff --git a/scripts/genxs.in b/scripts/genxs.in
deleted file mode 100644
index ed5cc077b6a..00000000000
--- a/scripts/genxs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/genxs.exe "$@"
diff --git a/scripts/gmcs.in b/scripts/gmcs.in
deleted file mode 100644
index 704dcf29ae9..00000000000
--- a/scripts/gmcs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-MONO_PATH="@mono_two_instdir@:$MONO_PATH" exec @bindir@/@mono_interp@ @mono_two_instdir@/gmcs.exe "$@"
diff --git a/scripts/ilasm.in b/scripts/ilasm.in
deleted file mode 100644
index 2ef075e7429..00000000000
--- a/scripts/ilasm.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/ilasm.exe "$@"
diff --git a/scripts/makecert.in b/scripts/makecert.in
deleted file mode 100644
index 41d70191235..00000000000
--- a/scripts/makecert.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/MakeCert.exe "$@"
diff --git a/scripts/mbas.in b/scripts/mbas.in
deleted file mode 100644
index 6860e8db14c..00000000000
--- a/scripts/mbas.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/mbas.exe "$@"
diff --git a/scripts/mcs.in b/scripts/mcs.in
deleted file mode 100644
index f8ce4ffad06..00000000000
--- a/scripts/mcs.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/mcs.exe "$@"
diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
deleted file mode 100644
index 2766a452a9c..00000000000
--- a/scripts/mono-find-provides.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/mono-find-provides.exe "$@"
diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in
deleted file mode 100644
index 8b74418fbb5..00000000000
--- a/scripts/mono-find-requires.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/mono-find-requires.exe "$@"
diff --git a/scripts/monop.in b/scripts/monop.in
deleted file mode 100644
index 27a992db566..00000000000
--- a/scripts/monop.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/monop.exe "$@"
diff --git a/scripts/monoresgen.in b/scripts/monoresgen.in
deleted file mode 100644
index fd4bec7fd38..00000000000
--- a/scripts/monoresgen.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/monoresgen.exe "$@"
diff --git a/scripts/resgen.in b/scripts/resgen.in
deleted file mode 100644
index fd4bec7fd38..00000000000
--- a/scripts/resgen.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/monoresgen.exe "$@"
diff --git a/scripts/secutil.in b/scripts/secutil.in
deleted file mode 100644
index 8c82f2ec045..00000000000
--- a/scripts/secutil.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/secutil.exe "$@"
diff --git a/scripts/setreg.in b/scripts/setreg.in
deleted file mode 100644
index 1d21a35ba6b..00000000000
--- a/scripts/setreg.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/setreg.exe "$@"
diff --git a/scripts/signcode.in b/scripts/signcode.in
deleted file mode 100644
index e87a12816c7..00000000000
--- a/scripts/signcode.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/signcode.exe "$@"
diff --git a/scripts/sn.in b/scripts/sn.in
deleted file mode 100644
index 133b30cb0db..00000000000
--- a/scripts/sn.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/sn.exe "$@"
diff --git a/scripts/soapsuds.in b/scripts/soapsuds.in
deleted file mode 100644
index 5dcb9341dc3..00000000000
--- a/scripts/soapsuds.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/soapsuds.exe "$@"
diff --git a/scripts/sqlsharp.in b/scripts/sqlsharp.in
deleted file mode 100644
index d31ae17d270..00000000000
--- a/scripts/sqlsharp.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/sqlsharp.exe "$@"
diff --git a/scripts/wsdl.in b/scripts/wsdl.in
deleted file mode 100644
index 4133d23549e..00000000000
--- a/scripts/wsdl.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/wsdl.exe "$@"
diff --git a/scripts/wsdl2.in b/scripts/wsdl2.in
deleted file mode 100644
index aa9ebc72431..00000000000
--- a/scripts/wsdl2.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_two_instdir@/wsdl2.exe "$@"
diff --git a/scripts/xsd.in b/scripts/xsd.in
deleted file mode 100644
index 51febb6ec24..00000000000
--- a/scripts/xsd.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec @bindir@/@mono_interp@ @mono_one_instdir@/xsd.exe "$@"