X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2FMakefile.am;h=1ffeee3e6e33388c62271d8d34e2d6b896d86053;hb=1288c84cd73c2aac7bc61f4eeb55c6e08c04c29d;hp=e4176a72f1610fb226aee680b2cc04bd2c80fd79;hpb=6f60c54d7ef4e3e0f6d20d31b90433883c50102c;p=mono.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index e4176a72f16..1ffeee3e6e3 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,26 +25,27 @@ COMPAT_2_0_SUFFIX=2$(SCRIPT_SUFFIX)
 COMPAT_4_0_SUFFIX=4$(SCRIPT_SUFFIX)
 
 bin_SCRIPTS = \
-	$(scripts_2_0_umask)	\
+	$(scripts_4_0_umask)	\
 	$(scripts_defaults)	\
 	$(scripts_2_0)		\
 	$(scripts_service)	\
 	$(scripts_nunit)	\
 	$(scripts_rpmhelpers)	\
-	$(scripts_mcs)		\
 	$(MDOC_SUBCOMMANDS)	\
 	$(MDOC_COMPAT)		\
-	mod$(SCRIPT_SUFFIX)	\
 	mono-test-install	\
 	peverify			\
+	mcs					\
+	gmcs				\
 	mono-heapviz		\
 	$(scripts_mono_configuration_crypto)
 
 if INSTALL_4_0
 bin_SCRIPTS += $(scripts_4_0)
+bin_SCRIPTS += dmcs
 endif
 
-scripts_2_0_umask = \
+scripts_4_0_umask = \
 	makecert$(SCRIPT_SUFFIX)		\
 	sn$(SCRIPT_SUFFIX)
 
@@ -54,16 +55,13 @@ deprecated = 					\
 
 scripts_2_0 = \
 	al2$(SCRIPT_SUFFIX)			\
-	csharp2$(SCRIPT_SUFFIX)			\
 	gacutil2$(SCRIPT_SUFFIX)		\
-	gmcs$(SCRIPT_SUFFIX)			\
 	mdoc$(SCRIPT_SUFFIX)                    \
 	monop2$(SCRIPT_SUFFIX) 			\
 	resgen2$(SCRIPT_SUFFIX)			\
 	wsdl2$(SCRIPT_SUFFIX)
 
 scripts_4_0 = \
-	dmcs$(SCRIPT_SUFFIX)			\
 	disco$(SCRIPT_SUFFIX)			\
 	dtd2xsd$(SCRIPT_SUFFIX)			\
 	dtd2rng$(SCRIPT_SUFFIX)			\
@@ -81,6 +79,7 @@ scripts_4_0 = \
 	httpcfg$(SCRIPT_SUFFIX)			\
 	lc$(SCRIPT_SUFFIX)			\
 	mconfig$(SCRIPT_SUFFIX)			\
+	mod$(SCRIPT_SUFFIX)			\
 	monolinker$(SCRIPT_SUFFIX)		\
 	mono-api-info$(SCRIPT_SUFFIX) 		\
 	mono-shlib-cop$(SCRIPT_SUFFIX) 		\
@@ -96,7 +95,8 @@ scripts_4_0 = \
 	sqlmetal$(SCRIPT_SUFFIX)		\
 	sqlsharp$(SCRIPT_SUFFIX)		\
 	svcutil$(SCRIPT_SUFFIX)			\
-	xbuild$(SCRIPT_SUFFIX)
+	xbuild$(SCRIPT_SUFFIX)			\
+	ccrewrite$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
 	mdoc-assemble \
@@ -131,10 +131,9 @@ scripts_defaults = 		\
 scripts_service = mono-service mono-service2
 scripts_nunit = nunit-console$(SCRIPT_SUFFIX) nunit-console2$(SCRIPT_SUFFIX)
 scripts_rpmhelpers = mono-find-provides mono-find-requires
-scripts_mcs = mcs$(SCRIPT_SUFFIX)
 scripts_mono_configuration_crypto = mono-configuration-crypto$(SCRIPT_SUFFIX)
 
-CLEANFILES = $(scripts_mono_configuration_crypto) $(scripts_mcs) $(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)
+CLEANFILES = $(scripts_mono_configuration_crypto) $(scripts_4_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 =			\
@@ -147,6 +146,9 @@ EXTRA_DIST =			\
 	mono-find-provides.in	\
 	mono-find-requires.in	\
 	peverify.in			\
+	mcs.in				\
+	gmcs.in				\
+	dmcs.in				\
 	mono-test-install	\
 	mono-heapviz		\
 	$(MDOC_COMPAT)		\
@@ -185,15 +187,31 @@ REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g
 
 REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
 REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
+if INSTALL_4_0
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
+else
+REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
+endif
 REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
 peverify: peverify.in Makefile
 	$(REWRITE_COMMON) $(srcdir)/peverify.in > $@.tmp
 	mv -f $@.tmp $@
 
+mcs: mcs.in Makefile
+	$(REWRITE_COMMON) $(srcdir)/mcs.in > $@.tmp
+	mv -f $@.tmp $@
+
+gmcs: gmcs.in Makefile
+	$(REWRITE_COMMON) $(srcdir)/gmcs.in > $@.tmp
+	mv -f $@.tmp $@
+
+dmcs: dmcs.in Makefile
+	$(REWRITE_COMMON) $(srcdir)/dmcs.in > $@.tmp
+	mv -f $@.tmp $@
+
 mono-service: mono-service.in Makefile
-	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
+	$(REWRITE4) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
 	mv -f $@.tmp $@
 
 mono-service2: mono-service.in Makefile
@@ -214,12 +232,9 @@ mod$(SCRIPT_SUFFIX): mod.in Makefile
 	mv -f $@.tmp $@
 
 #FIXME: this is not the correct rule for bat files.
-$(scripts_2_0_umask): script_umask.in Makefile
-	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
-	mv -f $@.tmp $@
-
-mcs$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-	$(REWRITE2) -e "s,@exe_name@,gmcs,g" $(srcdir)/$(SCRIPT_IN) > $@.tmp
+$(scripts_4_0_umask): script_umask.in Makefile
+	n=`echo $@ | sed 's,$(COMPAT_4_0_SUFFIX)$$,,'`; \
+	$(REWRITE4) -e "s,@""exe_name@,$$n,g" $(srcdir)/script_umask.in | $(FILTER) > $@.tmp
 	mv -f $@.tmp $@
 
 $(scripts_defaults): $(SCRIPT_IN) Makefile
@@ -238,7 +253,7 @@ $(scripts_4_0): $(SCRIPT_IN) Makefile
 	mv -f $@.tmp $@
 
 $(scripts_mono_configuration_crypto): mono-configuration-crypto.in
-	$(REWRITE2)  -e "s,@exe_name@,mono-configuration-crypto,g" $(srcdir)/mono-configuration-crypto.in > $@.tmp
+	$(REWRITE4)  -e "s,@exe_name@,mono-configuration-crypto,g" $(srcdir)/mono-configuration-crypto.in > $@.tmp
 	mv -f $@.tmp $@
 
 $(MDOC_SUBCOMMANDS): Makefile