X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2FMakefile.am;h=b1fb2fd10c210861eaed3d014715790eaffc961b;hb=a974a1f6fffb9003de9404c879b104834954cdd0;hp=f1014abd16be34e5029483bc350d8a79beb210a9;hpb=c4a3b30460c7ea1a1fb3c97cfc8478555714af2f;p=mono.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f1014abd16b..b1fb2fd10c2 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,13 +1,39 @@
+#
+# Scripts that we install
+#
+# Starting with Mono 2.0, the majority of the tools default to the 
+# 2.0 profile.  Commands that support the 1.0 toolchain and must
+# run under 1.0 have the number 1 appended to their command names
+# (for example mcs1 is the C# 1.0 compiler) and are listed in the
+# scripts_1_0 compat variable.
+# 
+# To preserve compatibility with old Makefiles and tools we keep the
+# command names that had the suffix 2 (like wsdl2)
+#
 bin_SCRIPTS = \
 	$(scripts_1_0)		\
 	$(scripts_1_0_umask)	\
+	$(scripts_1_0_compat)	\
+	$(scripts_defaults)	\
 	$(scripts_2_0)		\
+	$(scripts_2_1)		\
 	$(scripts_service)	\
 	$(scripts_nunit)	\
-	$(scripts_rpmhelpers)
+	$(scripts_rpmhelpers)	\
+	mono-test-install
+
+scripts_1_0_compat = \
+	al1			\
+	genxs1			\
+	ilasm1			\
+	mcs1			\
+	mkbundle1		\
+	mono-api-info1		\
+	monop1			\
+	resgen1			\
+	wsdl1
 
 scripts_1_0 = \
-	al			\
 	caspol			\
 	cert2spc		\
 	certmgr			\
@@ -17,26 +43,22 @@ scripts_1_0 = \
 	dtd2xsd			\
 	dtd2rng			\
 	gacutil			\
-	genxs			\
-	ilasm			\
+	installvst		\
 	macpack			\
-	mbas			\
 	mcs			\
 	mjs			\
-	mkbundle		\
-	monop			\
+	monolinker		\
+	mono-api-diff 		\
 	mono-shlib-cop 		\
 	mono-xmltool		\
 	mozroots		\
 	permview		\
 	prj2make		\
-	resgen			\
 	secutil			\
 	setreg			\
 	signcode		\
 	soapsuds		\
 	sqlsharp		\
-	wsdl			\
 	xsd
 
 scripts_1_0_umask = \
@@ -44,13 +66,39 @@ scripts_1_0_umask = \
 	sn
 
 scripts_2_0 = \
+	al2			\
+	genxs2			\
 	gmcs			\
+	httpcfg			\
 	ilasm2			\
+	mconfig			\
+	mkbundle2		\
+	mono-api-info2 		\
 	monop2 			\
 	resgen2			\
 	wsdl2			\
+	xsd2			\
+	sgen			\
 	xbuild
 
+#
+# these are the new defaults, 2.0 profile-based commands
+#
+# we can move scripts_1_0 scripts here as we see fit, if we need to
+# keep a 1.0 command available, we should additionally put it on
+# the scripts_1_0_compat list
+#
+scripts_defaults = 		\
+	al			\
+	genxs			\
+	ilasm			\
+	mkbundle		\
+	mono-api-info		\
+	monop			\
+	resgen			\
+	wsdl
+
+scripts_2_1 = smcs
 scripts_service = mono-service mono-service2
 scripts_nunit = nunit-console nunit-console2
 scripts_rpmhelpers = mono-find-provides mono-find-requires
@@ -58,16 +106,18 @@ scripts_rpmhelpers = mono-find-provides mono-find-requires
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= mono-nunit.pc
 
-CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) gmcs mono-service mono-service2
+CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_2_1) $(scripts_defaults) $(scripts_1_0_compat) mono-service mono-service2 nunit-console nunit-console2 mono-find-provides mono-find-requires
 DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
 
 EXTRA_DIST =                   \
 	script.in              \
 	script_umask.in        \
+	smcs.in			\
 	mono-service.in        \
 	mono-nunit.pc.in       \
 	mono-find-provides.in  \
-	mono-find-requires.in
+	mono-find-requires.in	\
+	mono-test-install
 
 if USE_JIT
 mono_interp = mono
@@ -94,6 +144,7 @@ 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'
 REWRITE1_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,1.0,g'
 REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
@@ -113,6 +164,10 @@ nunit-console2: script.in Makefile
 	$(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
 
+smcs: smcs.in Makefile
+	$(REWRITE2_1) -e "s,@""exe_name@,smcs,g" $(srcdir)/smcs.in > $@.tmp
+	mv $@.tmp $@
+
 $(scripts_1_0): script.in Makefile
 	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
@@ -121,7 +176,16 @@ $(scripts_1_0_umask): script_umask.in Makefile
 	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
 	mv $@.tmp $@
 
+$(scripts_1_0_compat): script.in Makefile
+	t=`basename $@ 1`; $(REWRITE1) -e "s,@exe_name@,$$t,g" $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@
+
+$(scripts_defaults): script.in Makefile
+	$(REWRITE2) -e "s,@exe_name@,$@,g" $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@
+
 $(scripts_2_0): script.in Makefile
 	n=`echo $@ | sed 's,2$$,,'`; \
 	$(REWRITE2) -e "s,@""exe_name@,$$n,g" $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
+