2010-03-02 Rolf Bjarne Kvinge <[email protected]>

	* Makefile.am:
	* mono/Makefile.am: Only build some subdirs when configured for
	moonlight.

	* configure.in: If configured --with-moonlight=yes, define MOONLIGHT and
	use that variable instead of INSTALL_2_1.

	* runtime/Makefile.am: If configured for moonlight, only build
	net_2_1_raw.


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

ChangeLog

@@ -1,3 +1,15 @@
+2010-03-02  Rolf Bjarne Kvinge  <[email protected]>
+
+	* Makefile.am:
+	* mono/Makefile.am: Only build some subdirs when configured for
+	moonlight.
+
+	* configure.in: If configured --with-moonlight=yes, define MOONLIGHT and
+	use that variable instead of INSTALL_2_1.
+
+	* runtime/Makefile.am: If configured for moonlight, only build
+	net_2_1_raw.
+
 2010-03-02  Mark Probst  <[email protected]>
 
 	* tools/sgen-grep-binprot.c: Tool for searching through the binary
@@ -5383,5 +5395,3 @@ Wed Jul 11 00:36:36 CEST 2001 Paolo Molaro <[email protected]>
 2001-05-30  Miguel de Icaza  <[email protected]>
 
 	* NEWS: 
-
-

Makefile.am

@@ -5,13 +5,17 @@ if CROSS_COMPILING
 SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) data runtime scripts man samples web msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native data runtime scripts man samples web tools msvc docs
+DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native         data runtime scripts man samples web tools msvc docs
+else
+if MOONLIGHT
+SUBDIRS =    $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir)         data runtime
 else
 SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support data runtime scripts man samples web msvc $(docs_dir)
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
 DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support data runtime scripts man samples web tools msvc docs
 endif
+endif
 
 EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in build-mingw32.sh LICENSE mkinstalldirs autogen.sh 
 

configure.in

@@ -2402,7 +2402,6 @@ esac
 
 #AC_ARG_WITH(profile2,  [  --with-profile2=yes,no          If you want to install the 2.0 FX (defaults to yes)],                 [], [with_profile2=yes])
 AC_ARG_WITH(profile4,  [  --with-profile4=yes,no          If you want to install the 4.0 FX (defaults to yes)],                  [], [with_profile4=yes])
-AC_ARG_WITH(moonlight, [  --with-moonlight=yes,no         If you want to build the Moonlight 2.1 assemblies (defaults to yes)], [], [with_moonlight=yes])
 AC_ARG_WITH(monotouch, [  --with-monotouch=yes,no         If you want to build the raw MonoTouch 2.1 assemblies (defaults to no)], [], [with_monotouch=no])
 
 OPROFILE=no
@@ -2435,6 +2434,16 @@ AC_ARG_WITH(mcs_docs,[  --with-mcs-docs=yes,no         If you want to build the
 	fi
 ])
 
+MOONLIGHT=no
+AC_ARG_WITH(moonlight, [  --with-moonlight=yes,no         If you want to build Mono for Moonlight (defaults to no - the resulting mono build is useless for anything but moonlight)],[
+	if test x$with_moonlight = xyes; then
+		MOONLIGHT=yes
+		AC_DEFINE(MOONLIGHT,1,[Building for Moonlight])
+	fi
+])
+
+
+
 dnl
 dnl Consistency settings
 dnl
@@ -2452,7 +2461,7 @@ AC_SUBST(OPROFILE_LIBS)
 
 libmono_ldflags="$libmono_ldflags $LIBS"
 
-AM_CONDITIONAL(INSTALL_2_1, [test "x$with_moonlight" = xyes])
+AM_CONDITIONAL(MOONLIGHT, [test "x$with_moonlight" = xyes])
 AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
 AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" = xyes])
 
@@ -2763,15 +2772,16 @@ fi
       echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
       echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
       echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
-      if test x$with_moonlight = xyes; then
-        echo "WITH_MOONLIGHT = yes" >> $srcdir/$olivedir/build/config.make
-      fi
     fi
   fi
 
   if test x$DISABLE_MCS_DOCS = xyes; then
 	echo "DISABLE_MCS_DOCS = yes" >> $srcdir/$mcsdir/build/config.make
   fi
+
+  if test x$with_moonlight = xyes; then
+	echo "MOONLIGHT = 1" >> $srcdir/$mcsdir/build/config.make
+  fi
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}

mono/Makefile.am

@@ -1,6 +1,9 @@
 if CROSS_COMPILING
-SUBDIRS = utils io-layer cil metadata arch interpreter mini dis
+SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis
 else
-SUBDIRS = utils io-layer cil metadata \
-      arch interpreter mini dis monograph tests benchmark profiler
+if MOONLIGHT
+SUBDIRS = utils io-layer     metadata arch $(interpreter_dir) mini
+else
+SUBDIRS = utils io-layer cil metadata arch $(interpreter_dir) mini dis monograph tests benchmark profiler
+endif
 endif

mono/tests/ChangeLog

@@ -1,3 +1,7 @@
+2010-03-02  Rolf Bjarne Kvinge  <[email protected]>
+
+	* Makefile.am: Renamed INSTALL_2_1 to MOONLIGHT.
+
 2010-03-01  Zoltan Varga  <[email protected]>
 
 	* dtest.cs: Add a test for CreateBoxedValue.

mono/tests/Makefile.am

@@ -529,7 +529,7 @@ test_messages: w32message.exe
 	> test_messages.zero
 	$(JITTEST_PROG_RUN) w32message.exe >& w32message.allout && cmp test_messages.zero w32message.allout
 
-if INSTALL_2_1
+if MOONLIGHT
 test_2_1 : test-coreclr-security
 else
 test_2_1 :
@@ -751,7 +751,7 @@ bug-382986.exe: bug-382986.cs bug-382986-lib.dll
 
 EXTRA_DIST += coreclr-security.cs
 
-if INSTALL_2_1
+if MOONLIGHT
 coreclr-security.exe : coreclr-security.cs
 	$(SMCS) -out:coreclr-security.exe $(srcdir)/coreclr-security.cs
 

runtime/Makefile.am

@@ -24,19 +24,19 @@ $(symlinks):
 
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 
+if MOONLIGHT
+build_profiles = net_2_1_raw
+test_profiles = net_2_1_raw
+else
 build_profiles = net_2_0 net_3_5
 test_profiles = $(build_profiles)
+endif
 
 if INSTALL_4_0
 build_profiles += net_4_0
 #test_profiles += net_4_0
 endif
 
-if INSTALL_2_1
-build_profiles += net_2_1_raw
-test_profiles += net_2_1_raw
-endif
-
 if INSTALL_MONOTOUCH
 build_profiles += monotouch
 endif
@@ -80,14 +80,6 @@ else
 test_select = ONLY_CENTUM_TESTS=yes
 endif
 
-if INSTALL_2_1
-moon-do-build: test-support-files
-	cd $(top_builddir)/../moon/class && $(MAKE) all
-else
-moon-do-build:
-	@:
-endif
-
 mcs-do-test-profiles:
 	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles