Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / scripts / Makefile.am

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 93adea143ed417dafe5ec142310c3a86b6ca9e54..9f792fd13655e10345e1d65dc48350d1ad4a0ba1 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -34,18 +34,17 @@ bin_SCRIPTS = \
        $(MDOC_SUBCOMMANDS)     \
        $(MDOC_COMPAT)          \
        mono-test-install       \
-       peverify                        \
-       mcs                                     \
-       gmcs                            \
+       peverify                \
+       mcs                     \
+       csc                                     \
+       csi                     \
+       mono-package-runtime    \
        mono-heapviz            \
        $(scripts_mono_configuration_crypto)
 
-if INSTALL_4_0
+if INSTALL_4_x
 bin_SCRIPTS += $(scripts_4_0)
 bin_SCRIPTS += dmcs
-endif
-
-if INSTALL_4_5
 bin_SCRIPTS += xbuild
 endif
 
@@ -73,9 +72,9 @@ scripts_4_0 = \
        macpack$(SCRIPT_SUFFIX)                 \
        mdoc$(SCRIPT_SUFFIX)                    \
        mono-cil-strip$(SCRIPT_SUFFIX)          \
-       prj2make$(SCRIPT_SUFFIX)                \
        soapsuds$(SCRIPT_SUFFIX)                \
        caspol$(SCRIPT_SUFFIX)                  \
+       cert-sync$(SCRIPT_SUFFIX)               \
        cert2spc$(SCRIPT_SUFFIX)                \
        certmgr$(SCRIPT_SUFFIX)                 \
        chktrust$(SCRIPT_SUFFIX)                \
@@ -87,6 +86,7 @@ scripts_4_0 = \
        mod$(SCRIPT_SUFFIX)                     \
        monolinker$(SCRIPT_SUFFIX)              \
        mono-api-info$(SCRIPT_SUFFIX)           \
+       mono-api-html$(SCRIPT_SUFFIX)           \
        mono-shlib-cop$(SCRIPT_SUFFIX)          \
        mozroots$(SCRIPT_SUFFIX)                \
        permview$(SCRIPT_SUFFIX)                \
@@ -103,7 +103,8 @@ scripts_4_0 = \
        ccrewrite$(SCRIPT_SUFFIX)               \
        cccheck$(SCRIPT_SUFFIX)                 \
        mdbrebase$(SCRIPT_SUFFIX)               \
-       ikdasm$(SCRIPT_SUFFIX)
+       ikdasm$(SCRIPT_SUFFIX)                  \
+       mono-symbolicate$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
        mdoc-assemble \
@@ -154,21 +155,20 @@ EXTRA_DIST =                      \
        mono-find-requires.in   \
        peverify.in                     \
        xbuild.in                       \
-       update_submodules               \
+       update_submodules.sh    \
        mcs.in                          \
-       gmcs.in                         \
+       csc.in                          \
        dmcs.in                         \
+       csi.in                  \
+       mono-package-runtime    \
        mono-test-install       \
        mono-heapviz            \
        $(MDOC_COMPAT)          \
-       get-cygwin-deps.sh      \
-       mono-configuration-crypto.in
+       mono-configuration-crypto.in    \
+       submodules/versions.mk  \
+       submodules/versions.py
 
-if USE_JIT
 mono_interp = mono
-else
-mono_interp = mint
-endif
 
 if HOST_WIN32
 if CROSS_COMPILING
@@ -192,22 +192,9 @@ 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'
-REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
-REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
-REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
-if INSTALL_4_5
 REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.5,g'
 REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.5,g'
-else 
-if INSTALL_4_0
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,4.0,g'
-REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,4.0,g'
-else
-REWRITE4 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
-REWRITE4_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
-endif
-endif
 
 peverify: peverify.in Makefile
        $(REWRITE_COMMON) $(srcdir)/peverify.in > $@.tmp
@@ -217,28 +204,32 @@ mcs: mcs.in Makefile
        $(REWRITE_COMMON) $(srcdir)/mcs.in > $@.tmp
        mv -f $@.tmp $@
 
-gmcs: gmcs.in Makefile
-       $(REWRITE_COMMON) $(srcdir)/gmcs.in > $@.tmp
+csc: csc.in Makefile
+       $(REWRITE_COMMON) $(srcdir)/csc.in > $@.tmp
        mv -f $@.tmp $@
 
 dmcs: dmcs.in Makefile
        $(REWRITE_COMMON) $(srcdir)/dmcs.in > $@.tmp
        mv -f $@.tmp $@
 
+csi: csi.in Makefile
+       $(REWRITE_COMMON) $(srcdir)/csi.in > $@.tmp
+       mv -f $@.tmp $@
+
 mono-service: mono-service.in Makefile
        $(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
+       $(REWRITE4) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
        mv -f $@.tmp $@
 
 nunit-console$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
-       $(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
+       $(REWRITE4_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
+       $(REWRITE4_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
 nunit-console4$(SCRIPT_SUFFIX): $(SCRIPT_IN) Makefile
@@ -251,7 +242,7 @@ xbuild: xbuild.in Makefile
 
 #FIXME: this is not the correct rule for mod.bat.
 mod$(SCRIPT_SUFFIX): mod.in Makefile
-       $(REWRITE2) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
+       $(REWRITE4) -e "s,@""exe_name@,mod,g" $(srcdir)/mod.in > $@.tmp
        mv -f $@.tmp $@
 
 #FIXME: this is not the correct rule for bat files.
@@ -267,7 +258,7 @@ $(scripts_defaults): $(SCRIPT_IN) Makefile
 
 $(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
+       $(REWRITE4) -e "s,@""exe_name@,$$n,g" $(srcdir)/$(SCRIPT_IN) | $(FILTER) > $@.tmp
        mv -f $@.tmp $@
 
 $(scripts_4_0): $(SCRIPT_IN) Makefile