Removed 1.0 scripts generation code

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

1 files changed, 22 insertions, 48 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 6498e85aeba..429d5b356de 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,9 +25,7 @@ COMPAT_2_0_SUFFIX=2$(SCRIPT_SUFFIX)
 COMPAT_4_0_SUFFIX=4$(SCRIPT_SUFFIX)
 
 bin_SCRIPTS = \
-	$(scripts_1_0)		\
-	$(scripts_1_0_umask)	\
-	$(scripts_1_0_compat)	\
+	$(scripts_2_0_umask)	\
 	$(scripts_defaults)	\
 	$(scripts_2_0)		\
 	$(scripts_service)	\
@@ -42,22 +40,11 @@ if INSTALL_4_0
 bin_SCRIPTS += $(scripts_4_0)
 endif
 
-scripts_1_0_compat = \
-	al1$(SCRIPT_SUFFIX)			\
-	genxs1$(SCRIPT_SUFFIX)			\
-	ilasm1$(SCRIPT_SUFFIX)			\
-	mcs1$(SCRIPT_SUFFIX)			\
-	mkbundle1$(SCRIPT_SUFFIX)		\
-	gacutil1$(SCRIPT_SUFFIX)			\
-	monop1$(SCRIPT_SUFFIX)			\
-	resgen1$(SCRIPT_SUFFIX)			\
-	wsdl1$(SCRIPT_SUFFIX)
-
-scripts_1_0 = \
-	caspol$(SCRIPT_SUFFIX)			\
-	cert2spc$(SCRIPT_SUFFIX)		\
-	certmgr$(SCRIPT_SUFFIX)			\
-	chktrust$(SCRIPT_SUFFIX)		\
+scripts_2_0_umask = \
+	makecert$(SCRIPT_SUFFIX)		\
+	sn$(SCRIPT_SUFFIX)
+
+scripts_2_0 = \
 	cilc$(SCRIPT_SUFFIX)			\
 	disco$(SCRIPT_SUFFIX)			\
 	dtd2xsd$(SCRIPT_SUFFIX)			\
@@ -68,21 +55,13 @@ scripts_1_0 = \
 	mcs$(SCRIPT_SUFFIX)			\
 	mjs$(SCRIPT_SUFFIX)			\
 	mono-cil-strip$(SCRIPT_SUFFIX)		\
-	mozroots$(SCRIPT_SUFFIX)		\
-	permview$(SCRIPT_SUFFIX)		\
 	prj2make$(SCRIPT_SUFFIX)		\
-	secutil$(SCRIPT_SUFFIX)			\
-	setreg$(SCRIPT_SUFFIX)			\
-	signcode$(SCRIPT_SUFFIX)		\
 	soapsuds$(SCRIPT_SUFFIX)		\
-	xsd$(SCRIPT_SUFFIX)
-
-scripts_1_0_umask = \
-	makecert$(SCRIPT_SUFFIX)		\
-	sn$(SCRIPT_SUFFIX)
-
-scripts_2_0 = \
 	al2$(SCRIPT_SUFFIX)			\
+	caspol$(SCRIPT_SUFFIX)			\
+	cert2spc$(SCRIPT_SUFFIX)		\
+	certmgr$(SCRIPT_SUFFIX)			\
+	chktrust$(SCRIPT_SUFFIX)		\
 	csharp$(SCRIPT_SUFFIX)			\
 	gacutil2$(SCRIPT_SUFFIX)		\
 	gmcs$(SCRIPT_SUFFIX)			\
@@ -95,11 +74,16 @@ scripts_2_0 = \
 	mono-api-info$(SCRIPT_SUFFIX) 		\
 	mono-shlib-cop$(SCRIPT_SUFFIX) 		\
 	monop2$(SCRIPT_SUFFIX) 			\
+	mozroots$(SCRIPT_SUFFIX)		\
+	permview$(SCRIPT_SUFFIX)		\
 	resgen2$(SCRIPT_SUFFIX)			\
 	pdb2mdb$(SCRIPT_SUFFIX)			\
 	wsdl2$(SCRIPT_SUFFIX)			\
-	xsd2$(SCRIPT_SUFFIX)			\
+	xsd$(SCRIPT_SUFFIX)			\
 	mono-xmltool$(SCRIPT_SUFFIX)		\
+	setreg$(SCRIPT_SUFFIX)			\
+	secutil$(SCRIPT_SUFFIX)			\
+	signcode$(SCRIPT_SUFFIX)		\
 	sgen$(SCRIPT_SUFFIX)			\
 	sqlmetal$(SCRIPT_SUFFIX)		\
 	sqlsharp$(SCRIPT_SUFFIX)		\
@@ -143,7 +127,7 @@ scripts_service = mono-service mono-service2
 scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX)
 scripts_rpmhelpers = mono-find-provides mono-find-requires
 
-CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_defaults) $(scripts_1_0_compat) $(scripts_4_0) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires mod $(MDOC_SUBCOMMANDS)
+CLEANFILES = $(scripts_2_0_umask) $(scripts_2_0) $(scripts_defaults) $(scripts_4_0) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires mod $(MDOC_SUBCOMMANDS)
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
 EXTRA_DIST =			\
@@ -188,16 +172,14 @@ REWRITE_COMMON = sed \
 REWRITE = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp),g'
 REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g'
 
-REWRITE1 = $(REWRITE) -e 's,@''framework_version@,1.0,g'
 REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
-REWRITE1_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,1.0,g'
 REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
 
 mono-service: mono-service.in Makefile
-	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
+	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
 	mv -f $@.tmp $@
 
 mono-service2: mono-service.in Makefile
@@ -205,7 +187,7 @@ mono-service2: mono-service.in Makefile
 	mv -f $@.tmp $@
 
 nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-	$(REWRITE1_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+	$(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
 	mv -f $@.tmp $@
 
 nunit-console2$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
@@ -214,20 +196,12 @@ nunit-console2$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
 
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
-	$(REWRITE1) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
-	mv -f $@.tmp $@
-
-$(scripts_1_0): $(SCRIPT_IN) Makefile
-	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+	$(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
 	mv -f $@.tmp $@
 
 #FIXME: this is not the correct rule for bat files.
-$(scripts_1_0_umask): script_umask.in Makefile
-	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
-	mv -f $@.tmp $@
-
-$(scripts_1_0_compat): $(SCRIPT_IN) Makefile
-	t=`basename $@ $(COMPAT_1_0_SUFFIX)`; $(REWRITE1) -e "s,@exe_name@,$$t,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+$(scripts_2_0_umask): script_umask.in Makefile
+	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
 	mv -f $@.tmp $@
 
 $(scripts_defaults): $(SCRIPT_IN) Makefile