rename net_2_1 to moonlight

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

diff --git a/ChangeLog b/ChangeLog
index 5043ae6eaac63f378b094f28dbb2c19f6dab09fb..fc7b3fd266578ec685e8247bb5943097fc210ad7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * runtime/Makefile.am, build-mingw32.sh: rename
+       the net_2_1 profile to moonlight.
+
 2010-03-10  Andrew Jorgensen  <ajorgensen@novell.com>
 
        * configure.in: configure eglib even when we are not building

diff --git a/build-mingw32.sh b/build-mingw32.sh
index 200c5fa71881a68495dc6f40f7a7427701ff7c18..3b0538e6fc13909c136f168cb964b917d84912f2 100755 (executable)
--- a/build-mingw32.sh
+++ b/build-mingw32.sh
@@ -8,7 +8,7 @@ CROSS_PKG_CONFIG_DIR=$CROSS_DIR/$MINGW/lib/pkgconfig
 COPY_DLLS="libgio*.dll libglib*.dll libgmodule*.dll libgthread*.dll libgobject*.dll"
 PATH=$CROSS_BIN_DIR:$PATH
 INSTALL_DESTDIR="$CURDIR/mono-win32"
-PROFILES="default net_2_0 net_2_1 net_3_5"
+PROFILES="default net_2_0 moonlight net_3_5"
 
 export PATH
 

diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index ad9d74609d8a23e32f6f8d8ce5202ce03eb6c060..2302a1ce41a45df9f1a7cc4da64f85b3be84ef57 100644 (file)
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -20,17 +20,17 @@ JITTEST_PROG_RUN = MONO_SHARED_DIR=$(mono_build_root)/runtime MONO_CFG_DIR=$(mon
 RUNTIME_ARGS=--config tests-config --optimize=all --debug
 
 with_mono_path = MONO_PATH=$(mcs_topdir)/class/lib/net_2_0
-with_mono_path21 = MONO_PATH=$(mcs_topdir)/class/lib/net_2_1_raw
+with_mono_path_moonlight = MONO_PATH=$(mcs_topdir)/class/lib/moonlight_raw
 
 RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
-RUNTIME21 = $(with_mono_path21) $(top_builddir)/runtime/mono-wrapper
+RUNTIME_MOONLIGHT = $(with_mono_path_moonlight) $(top_builddir)/runtime/mono-wrapper
 
 MKBUNDLE = \
        PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
        $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/mkbundle.exe
 
 MCS = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/gmcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219 -debug
-SMCS = $(RUNTIME21) --runtime=moonlight --security=temporary-smcs-hack $(mcs_topdir)/class/lib/net_2_1_raw/smcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
+SMCS = $(RUNTIME_MOONLIGHT) --runtime=moonlight --security=temporary-smcs-hack $(mcs_topdir)/class/lib/moonlight_raw/smcs.exe -unsafe -nowarn:0162 -nowarn:0168 -nowarn:0219
 ILASM = $(RUNTIME) $(mcs_topdir)/class/lib/net_2_0/ilasm.exe
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
@@ -758,7 +758,7 @@ coreclr-security.exe : coreclr-security.cs
 
 test-coreclr-security : coreclr-security.exe
        @echo "Testing coreclr-security.exe..."
-       @$(RUNTIME21) --security=core-clr-test coreclr-security.exe
+       @$(RUNTIME_MOONLIGHT) --security=core-clr-test coreclr-security.exe
 endif
 
 EXTRA_DIST += generic-unboxing.2.il

diff --git a/msvc/ChangeLog b/msvc/ChangeLog
index 7f804f0250f9c0e9fac4cc058b7fd6004e3b20e8..8b1aa4bbfe398eb7cf0dfb6a50540bcdfeead1e1 100755 (executable)
--- a/msvc/ChangeLog
+++ b/msvc/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * scripts/monowrap.cs, scripts/genproj.cs: rename
+       the net_2_1 profile to moonlight.
+
 2010-03-01  Robert Jordan  <robertj@gmx.net>
 
        * libmono.vcproj: Track changes.

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index ad27791b0368e267275029de3775d48269481157..a42fb3ec64b0555121b171dfbaa496daa16a6ec9 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -612,10 +612,10 @@ class MsbuildGenerator {
                        compiler = "net_2_0_bootstrap";
                else if (compiler.EndsWith ("mcs/gmcs.exe"))
                        compiler = "gmcs";
-               else if (compiler.EndsWith ("class/lib/net_2_1_bootstrap/smcs.exe"))
-                       compiler = "net_2_1_bootstrap";
-               else if (compiler.EndsWith ("class/lib/net_2_1_raw/smcs.exe"))
-                       compiler = "net_2_1_raw";
+               else if (compiler.EndsWith ("class/lib/moonlight_bootstrap/smcs.exe"))
+                       compiler = "moonlight_bootstrap";
+               else if (compiler.EndsWith ("class/lib/moonlight_raw/smcs.exe"))
+                       compiler = "moonlight_raw";
                else if (compiler.EndsWith ("class/lib/net_4_0_bootstrap/dmcs.exe"))
                        compiler = "net_4_0_bootstrap";
                else if (compiler.EndsWith ("class/lib/net_4_0/dmcs.exe"))
@@ -743,7 +743,7 @@ public class Driver {
                        // Do not do 2.1, it is not working yet
                        // Do not do basic, as there is no point (requires a system mcs to be installed).
                        //
-                       if (library.Contains ("net_2_1") || library.Contains ("-basic"))
+                       if (library.Contains ("moonlight") || library.Contains ("-basic"))
                                continue;
                        
                        var gen = new MsbuildGenerator (dir);

diff --git a/msvc/scripts/monowrap.cs b/msvc/scripts/monowrap.cs
index dc0261231c211a50d0771b30721cfeced09bcc09..5b476832433169e16ecca284337b9e78da22ab42 100755 (executable)
--- a/msvc/scripts/monowrap.cs
+++ b/msvc/scripts/monowrap.cs
@@ -24,14 +24,14 @@
 //    net_1_1           -> class/lib/net_1_1/mcs.exe
 //    net_2_0_bootstrap -> class/lib/net_2_0_bootstrap/gmcs.exe
 //    gmcs              -> mcs/gmcs.exe
-//    net_2_1_bootstrap -> class/lib/net_2_1_bootstrap/smcs.exe
-//    net_2_1_raw       -> class/lib/net_2_1_raw/smcs.exe
+//    moonlight_bootstrap -> class/lib/moonlight_bootstrap/smcs.exe
+//    moonlight_raw       -> class/lib/moonlight_raw/smcs.exe
 //
 // So for example:
-// net_2_1_bootstrap-net_2_0-net_2_1_bootstrap
+// moonlight_bootstrap-net_2_0-moonlight_bootstrap
 //
-// Will set MONO_PATH to "%MCS_ROOT%\class\lib\net_2_1_bootstrap;%MCS_ROOT\class\lib\net_2_0"
-// and run the compiler in %MCS_ROOT%\class\lib\net_2_1_bootstrap
+// Will set MONO_PATH to "%MCS_ROOT%\class\lib\moonlight_bootstrap;%MCS_ROOT\class\lib\net_2_0"
+// and run the compiler in %MCS_ROOT%\class\lib\moonlight_bootstrap
 //
 
 using System;
@@ -94,12 +94,12 @@ namespace csc
                                compiler = root_mcs + "\\mcs\\gmcs.exe";
                                break;
                                
-                       case "net_2_1_bootstrap":
-                               compiler = root_mcs + "\\class\\lib\\net_2_1_bootstrap\\smcs.exe";
+                       case "moonlight_bootstrap":
+                               compiler = root_mcs + "\\class\\lib\\moonlight_bootstrap\\smcs.exe";
                                break;
                                
-                       case "net_2_1_raw":
-                               compiler = root_mcs + "\\class\\lib\\net_2_1_raw\\smcs.exe";
+                       case "moonlight_raw":
+                               compiler = root_mcs + "\\class\\lib\\moonlight_raw\\smcs.exe";
                                break;
 
                        default:

diff --git a/msvc05/ChangeLog b/msvc05/ChangeLog
index 9db9f74c8d86c8d46ea5e797795dd6b6879bff78..d542b32675ca62592966618695cfa9cd9c0fa937 100755 (executable)
--- a/msvc05/ChangeLog
+++ b/msvc05/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-16  Jb Evain  <jbevain@novell.com>
+
+       * setup-solution.bat: rename the net_2_1 profile to moonlight.
+
 2010-01-18  Bill Holmes  <billholmes54@gmail.com>
 
        * libmono.vcproj : Adding a link to Mswsock.lib and adding files

diff --git a/msvc05/setup-solution.bat b/msvc05/setup-solution.bat
index e9f0ff0c80520868601b26a2799ab0985e90cf4f..2e7941a2cc68832f17980584e2afe23fc5e4a77e 100755 (executable)
--- a/msvc05/setup-solution.bat
+++ b/msvc05/setup-solution.bat
@@ -2,7 +2,7 @@
 mkdir scripts\net_1_1_bootstrap > nul 2> nul\r
 mkdir scripts\net_1_1 > nul 2> nul\r
 mkdir scripts\net_2_0 > nul 2> nul\r
-mkdir scripts\net_2_1 > nul 2> nul\r
+mkdir scripts\moonlight > nul 2> nul\r
 \r
 csc -debug -out:scripts\monowrap.exe scripts\monowrap.cs \r
 copy scripts\monowrap.exe scripts\net_1_1_bootstrap\csc.exe\r
@@ -14,8 +14,8 @@ copy scripts\monowrap.pdb scripts\net_1_1\csc.pdb
 copy scripts\monowrap.exe scripts\net_2_0\csc.exe\r
 copy scripts\monowrap.pdb scripts\net_2_0\csc.pdb\r
 \r
-copy scripts\monowrap.exe scripts\net_2_1\csc.exe\r
-copy scripts\monowrap.pdb scripts\net_2_1\csc.pdb\r
+copy scripts\monowrap.exe scripts\moonlight\csc.exe\r
+copy scripts\monowrap.pdb scripts\moonlight\csc.pdb\r
 \r
 echo Setup complete, you can now use build the solution\r
 \r

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 71e3b83c799a7a51e2470bd7c869dbce06ab488e..596c61b844b276585dc3fdafa971545a712c262a 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -25,8 +25,8 @@ $(symlinks):
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
 if MOONLIGHT
-build_profiles = net_2_1_raw
-test_profiles = net_2_1_raw
+build_profiles = moonlight_raw
+test_profiles = moonlight_raw
 else
 build_profiles = net_2_0 net_3_5
 test_profiles = $(build_profiles)
@@ -105,7 +105,7 @@ endif
 mcs-compileall: mono-wrapper etc/mono/config
        save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
        for profile in $(test_profiles); do \
-         if [ "net_2_1" = "$$profile" ]; then \
+         if [ "moonlight" = "$$profile" ]; then \
           break; \
       fi; \
          if [ "net_3_5" = "$$profile" ]; then \