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

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2f87b85e39d..1ffeee3e6e3 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -12,94 +12,91 @@
 #
 if USE_BATCH_FILES
 SCRIPT_IN=script.bat.in
-SMCS_IN=smcs.bat.in
 FILTER=sed -e 's,\.bat\.exe,\.exe,g' -e 's,/,\\,g'
 SCRIPT_SUFFIX=.bat
 else
 SCRIPT_IN=script.in
-SMCS_IN=smcs.in
 FILTER=cat
 SCRIPT_SUFFIX=
 endif
 
 COMPAT_1_0_SUFFIX=1$(SCRIPT_SUFFIX)
 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_4_0_umask)	\
 	$(scripts_defaults)	\
 	$(scripts_2_0)		\
-	$(scripts_2_1)		\
 	$(scripts_service)	\
 	$(scripts_nunit)	\
 	$(scripts_rpmhelpers)	\
 	$(MDOC_SUBCOMMANDS)	\
 	$(MDOC_COMPAT)		\
-	mod			\
-	mono-test-install
-
-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)		\
-	cilc$(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_4_0_umask = \
+	makecert$(SCRIPT_SUFFIX)		\
+	sn$(SCRIPT_SUFFIX)
+
+deprecated = 					\
+	cilc(SCRIPT_SUFFIX)			\
+	mjs(SCRIPT_SUFFIX)
+
+scripts_2_0 = \
+	al2$(SCRIPT_SUFFIX)			\
+	gacutil2$(SCRIPT_SUFFIX)		\
+	mdoc$(SCRIPT_SUFFIX)                    \
+	monop2$(SCRIPT_SUFFIX) 			\
+	resgen2$(SCRIPT_SUFFIX)			\
+	wsdl2$(SCRIPT_SUFFIX)
+
+scripts_4_0 = \
 	disco$(SCRIPT_SUFFIX)			\
 	dtd2xsd$(SCRIPT_SUFFIX)			\
 	dtd2rng$(SCRIPT_SUFFIX)			\
 	installvst$(SCRIPT_SUFFIX)		\
 	genxs$(SCRIPT_SUFFIX)			\
 	macpack$(SCRIPT_SUFFIX)			\
-	mcs$(SCRIPT_SUFFIX)			\
-	mjs$(SCRIPT_SUFFIX)			\
-	monolinker$(SCRIPT_SUFFIX)		\
 	mono-cil-strip$(SCRIPT_SUFFIX)		\
-	mono-xmltool$(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)			\
 	httpcfg$(SCRIPT_SUFFIX)			\
-	ilasm2$(SCRIPT_SUFFIX)			\
+	lc$(SCRIPT_SUFFIX)			\
 	mconfig$(SCRIPT_SUFFIX)			\
-	mkbundle2$(SCRIPT_SUFFIX)		\
-	mdoc$(SCRIPT_SUFFIX)                    \
+	mod$(SCRIPT_SUFFIX)			\
+	monolinker$(SCRIPT_SUFFIX)		\
 	mono-api-info$(SCRIPT_SUFFIX) 		\
 	mono-shlib-cop$(SCRIPT_SUFFIX) 		\
-	monop2$(SCRIPT_SUFFIX) 			\
-	resgen2$(SCRIPT_SUFFIX)			\
-	wsdl2$(SCRIPT_SUFFIX)			\
-	xsd2$(SCRIPT_SUFFIX)			\
+	mozroots$(SCRIPT_SUFFIX)		\
+	permview$(SCRIPT_SUFFIX)		\
+	pdb2mdb$(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)		\
-	xbuild$(SCRIPT_SUFFIX)
+	svcutil$(SCRIPT_SUFFIX)			\
+	xbuild$(SCRIPT_SUFFIX)			\
+	ccrewrite$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
 	mdoc-assemble \
@@ -131,12 +128,12 @@ scripts_defaults = 		\
 	resgen$(SCRIPT_SUFFIX)			\
 	wsdl$(SCRIPT_SUFFIX)
 
-scripts_2_1 = smcs$(SCRIPT_SUFFIX)
 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_mono_configuration_crypto = mono-configuration-crypto$(SCRIPT_SUFFIX)
 
-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 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 =			\
@@ -144,15 +141,20 @@ EXTRA_DIST =			\
 	script.bat.in		\
 	script_umask.in		\
 	script_umask.bat.in	\
-	smcs.in			\
-	smcs.bat.in		\
 	mod.in			\
 	mono-service.in		\
 	mono-find-provides.in	\
 	mono-find-requires.in	\
+	peverify.in			\
+	mcs.in				\
+	gmcs.in				\
+	dmcs.in				\
 	mono-test-install	\
+	mono-heapviz		\
 	$(MDOC_COMPAT)		\
-	patch-quiet.sh
+	patch-quiet.sh		\
+	get-cygwin-deps.sh	\
+	mono-configuration-crypto.in
 
 if USE_JIT
 mono_interp = mono
@@ -160,7 +162,7 @@ else
 mono_interp = mint
 endif
 
-if PLATFORM_WIN32
+if HOST_WIN32
 if CROSS_COMPILING
 plat_bindir = $(bindir)
 mono_instdir = $(prefix)/lib/mono
@@ -183,57 +185,76 @@ 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'
-REWRITE1_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,1.0,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
-	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
-	mv $@.tmp $@
+	$(REWRITE4) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
+	mv -f $@.tmp $@
 
 mono-service2: mono-service.in Makefile
 	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 
 nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-	$(REWRITE1_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.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
 	$(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
-
-smcs$(SCRIPT_SUFFIX): $(SMCS_IN) Makefile
-	$(REWRITE2_1) -e "s,@""exe_name@,smcs,g" $(srcdir)/$(SMCS_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
+	mv -f $@.tmp $@
 
+#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 $@.tmp $@
-
-$(scripts_1_0): $(SCRIPT_IN) Makefile
-	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
+	$(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
+	mv -f $@.tmp $@
 
-$(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 $@ $(COMPAT_1_0_SUFFIX)`; $(REWRITE1) -e "s,@exe_name@,$$t,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
+#FIXME: this is not the correct rule for bat files.
+$(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
-	$(REWRITE2) -e "s,@exe_name@,$@,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
+	n=`echo $@ | sed 's,$(COMPAT_4_0_SUFFIX)$$,,'`; \
+	$(REWRITE4) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+	mv -f $@.tmp $@
 
 $(scripts_2_0): $(SCRIPT_IN) Makefile
 	n=`echo $@ | sed 's,$(COMPAT_2_0_SUFFIX)$$,,'`; \
 	$(REWRITE2) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
-	mv $@.tmp $@
+	mv -f $@.tmp $@
+
+$(scripts_4_0): $(SCRIPT_IN) Makefile
+	n=`echo $@ | sed 's,$(COMPAT_4_0_SUFFIX)$$,,'`; \
+	$(REWRITE4) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+	mv -f $@.tmp $@
+
+$(scripts_mono_configuration_crypto): mono-configuration-crypto.in
+	$(REWRITE4)  -e "s,@exe_name@,mono-configuration-crypto,g" $(srcdir)/mono-configuration-crypto.in > $@.tmp
+	mv -f $@.tmp $@
 
 $(MDOC_SUBCOMMANDS): Makefile
 	for script in $(MDOC_SUBCOMMANDS) ; do                  \