Permalink
Browse files

Make the moonlight build less fragile

  • Loading branch information...
1 parent 2b6e4fe commit 2e6038e088bd9011738c4ec49f2029c681a21cd3 @rolfbjarne rolfbjarne committed Feb 17, 2011
Showing with 15 additions and 4 deletions.
  1. +1 −1 build/profiles/moonlight.make
  2. +13 −0 configure
  3. +1 −3 tools/moonlight/Makefile
View
2 build/profiles/moonlight.make
@@ -3,7 +3,7 @@
profile-check:
@:
-PROFILE_VBNC_FLAGS = /sdkpath:$(MCS_PATH)/class/lib/moonlight_raw/
+PROFILE_VBNC_FLAGS = /sdkpath:$(MOONLIGHT_SDK_LOCATION)
LIBRARY_SNK = $(topdir)/$(thisdir)/mono.snk
NO_INSTALL=yes
View
13 configure
@@ -3,11 +3,16 @@
VERSION=2.11
prefix=/usr/local
configured_profiles=
+moonlight_sdk_location=
while test x$1 != x; do
case $1 in
--prefix=*)
prefix=`echo $1 | sed 's/--prefix=//'`
;;
+ --moonlight-sdk-location=*)
+ moonlight_sdk_location=`echo $1 | sed 's/--moonlight-sdk-location=//'`
+ configured_profiles="moonlight $configured_profiles"
+ ;;
--prefix)
echo --prefix needs an argument: --prefix=directory >&2
;;
@@ -26,6 +31,13 @@ while test x$1 != x; do
shift
done
+if test "x$moonlight_sdk_location" == "x"; then
+ if test "x`echo $configured_profiles | grep moonlight`" != "x"; then
+ echo Configure error: --with-moonlight=yes requires --moonlight-sdk-location
+ exit 1
+ fi
+fi
+
echo "prefix=$prefix" > build/config.make
echo "exec_prefix=\${prefix}" >> build/config.make
echo "mono_libdir=\${exec_prefix}/lib" >> build/config.make
@@ -36,6 +48,7 @@ echo "RUNTIME=mono" >> build/config.make
echo "MONO_BASIC_VERSION=$VERSION" >> build/config.make
echo "VERSION :=$VERSION" >> build/config.make
echo "CONFIGURED_PROFILES :=$configured_profiles" >> build/config.make
+echo "MOONLIGHT_SDK_LOCATION :=$sdk_location" >> build/config.make
echo "mono-basic $VERSION module configure to use prefix=$prefix"
View
4 tools/moonlight/Makefile
@@ -17,11 +17,9 @@ test-local run-test-local run-test-ondotnet-local all-local install-local uninst
dist-local: dist-default
tuner.exe: tuner.vb
- $(MAKE) -C ../../vbnc
- mono --debug $(topdir)/class/lib/net_4_0/vbnc.exe tuner.vb -out:tuner.exe -r:`pkg-config --variable=Libraries cecil` -debug+
+ mono --debug $(topdir)/class/lib/bootstrap/vbnc.exe tuner.vb -out:tuner.exe -r:`pkg-config --variable=Libraries cecil` -debug+ -r:$(topdir)/class/lib/bootstrap/Microsoft.VisualBasic.dll -noconfig -novbruntimeref
moonlight: tuner.exe
- $(MAKE) -C ../../vbnc
mkdir -p $(topdir)/class/lib/moonlight
$(MAKE) -C ../../vbruntime/Microsoft.VisualBasic PROFILE=moonlight

0 comments on commit 2e6038e

Please sign in to comment.