Browse Source

(REWRITE): New. Common rewriting 'sed' command.
(bin_SCRIPTS): Unify all the script generating rules into one.

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

Raja R Harinath 21 years ago
parent
commit
2ea89aa1cc
2 changed files with 18 additions and 78 deletions
  1. 5 0
      ChangeLog
  2. 13 78
      scripts/Makefile.am

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2004-06-18  Raja R Harinath  <[email protected]>
+
+	* scripts/Makefile.am (REWRITE): New.  Common rewriting 'sed' command.
+	(bin_SCRIPTS): Unify all the script generating rules into one.
+
 2004-06-16  Raja R Harinath  <[email protected]>
 
 	* Makefile.am (bootstrap) [PLATFORM_WIN32]: Open code.  Don't

+ 13 - 78
scripts/Makefile.am

@@ -2,7 +2,7 @@ EXTRA_DIST = mcs.in mbas.in ilasm.in cilc.in monoresgen.in resgen.in secutil.in
 
 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 gmcs mono-find-requires mono-find-provides
 
-CLEANFILES = mcs mbas ilasm cilc monoresgen resgen secutil sqlsharp xsd wsdl al genxs soapsuds chktrust signcode disco sn cert2spc setreg makecert certmgr monop gacutil gmcs mono-find-requires mono-find-provides
+CLEANFILES = $(bin_SCRIPTS)
 
 if USE_JIT
 MONO_INTERP = mono
@@ -20,106 +20,41 @@ mono_one_instdir = $(libdir)/mono/1.0
 mono_two_instdir = $(libdir)/mono/2.0
 endif
 
-mcs: mcs.in
-	sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -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
+REWRITE = sed \
+	-e 's,@''bindir@,$(bindir),g'				\
+	-e 's,@''plat_bindir@,$(plat_bindir),g'			\
+	-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,@''mono_interp@,$(MONO_INTERP),g'
 
-gmcs: gmcs.in
-	sed -e 's^\@gtkdir\@^$(gtkdir)^g' -e 's^\@mono_two_instdir\@^$(mono_two_instdir)^g' -e 's^\@bindir\@^$(bindir)^g' -e 's^\@libdir\@^$(libdir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gmcs.in > gmcs.tmp \
-	&& mv gmcs.tmp gmcs 
+$(bin_SCRIPTS): Makefile.am
+	$(REWRITE) $(srcdir)/[email protected] > [email protected]
+	mv [email protected] $@
 
+mcs: mcs.in
+gmcs: gmcs.in
 mbas: mbas.in
-	sed -e 's^\@mono_one_instdir\@^$(mono_one_instdir)^g' -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' -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' -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' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/monoresgen.in > monoresgen.tmp \
-	&& mv monoresgen.tmp monoresgen
-
 resgen: resgen.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/resgen.in > resgen.tmp \
-        && mv resgen.tmp resgen
-
 secutil: secutil.in
-	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' -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' -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' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/wsdl.in > wsdl.tmp \
-	&& mv wsdl.tmp wsdl
-
 al: al.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/al.in > al.tmp \
-	&& mv al.tmp al
-
 genxs: genxs.in
-	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
-
 disco: disco.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/disco.in > disco.tmp \
-	&& mv disco.tmp disco
-
 soapsuds: soapsuds.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/soapsuds.in > soapsuds.tmp \
-	&& mv soapsuds.tmp soapsuds
-
 chktrust: chktrust.in
-	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' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/signcode.in > signcode.tmp \
-	&& mv signcode.tmp signcode
-
 sn: sn.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/sn.in > sn.tmp \
-	&& mv sn.tmp sn
-
 cert2spc: cert2spc.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/cert2spc.in > cert2spc.tmp \
-	&& mv cert2spc.tmp cert2spc
-
 setreg: setreg.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/setreg.in > setreg.tmp \
-	&& mv setreg.tmp setreg
-
 makecert: makecert.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/makecert.in > makecert.tmp \
-	&& mv makecert.tmp makecert
-
 certmgr: certmgr.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/certmgr.in > certmgr.tmp \
-	&& mv certmgr.tmp certmgr
-
 monop: monop.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/monop.in > monop.tmp \
-	&& mv monop.tmp monop
-
 gacutil: gacutil.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/gacutil.in > gacutil.tmp \
-	&& mv gacutil.tmp gacutil
-
 mono-find-provides: mono-find-provides.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mono-find-provides.in > mono-find-provides.tmp \
-	&& mv mono-find-provides.tmp mono-find-provides
-
 mono-find-requires: mono-find-requires.in
-	sed -e 's^\@bindir\@^$(bindir)^g' -e 's^\@mono_interp\@^$(MONO_INTERP)^g' -e's^\@plat_bindir\@^$(plat_bindir)^g' < $(srcdir)/mono-find-requires.in > mono-find-requires.tmp \
-	&& mv mono-find-requires.tmp mono-find-requires