Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Make the moonlight build less fragile

  • Loading branch information...
commit 2e6038e088bd9011738c4ec49f2029c681a21cd3 1 parent 2b6e4fe
Rolf Bjarne Kvinge authored February 17, 2011
2  build/profiles/moonlight.make
@@ -3,7 +3,7 @@
3 3
 profile-check:
4 4
 	@:
5 5
 
6  
-PROFILE_VBNC_FLAGS = /sdkpath:$(MCS_PATH)/class/lib/moonlight_raw/
  6
+PROFILE_VBNC_FLAGS = /sdkpath:$(MOONLIGHT_SDK_LOCATION)
7 7
 
8 8
 LIBRARY_SNK = $(topdir)/$(thisdir)/mono.snk
9 9
 NO_INSTALL=yes
13  configure
@@ -3,11 +3,16 @@
3 3
 VERSION=2.11
4 4
 prefix=/usr/local
5 5
 configured_profiles=
  6
+moonlight_sdk_location=
6 7
 while test x$1 != x; do
7 8
         case $1 in
8 9
                 --prefix=*)
9 10
                         prefix=`echo $1 | sed 's/--prefix=//'`
10 11
                         ;;
  12
+                --moonlight-sdk-location=*)
  13
+                        moonlight_sdk_location=`echo $1 | sed 's/--moonlight-sdk-location=//'`
  14
+                        configured_profiles="moonlight $configured_profiles"
  15
+                        ;;
11 16
                 --prefix)
12 17
                         echo --prefix needs an argument: --prefix=directory >&2
13 18
                         ;;
@@ -26,6 +31,13 @@ while test x$1 != x; do
26 31
         shift
27 32
 done
28 33
 
  34
+if test "x$moonlight_sdk_location" == "x"; then
  35
+	if test "x`echo $configured_profiles | grep moonlight`" != "x"; then
  36
+		echo Configure error: --with-moonlight=yes requires --moonlight-sdk-location
  37
+		exit 1
  38
+	fi
  39
+fi
  40
+
29 41
 echo "prefix=$prefix" > build/config.make
30 42
 echo "exec_prefix=\${prefix}" >> build/config.make
31 43
 echo "mono_libdir=\${exec_prefix}/lib" >> build/config.make
@@ -36,6 +48,7 @@ echo "RUNTIME=mono" >> build/config.make
36 48
 echo "MONO_BASIC_VERSION=$VERSION" >> build/config.make
37 49
 echo "VERSION :=$VERSION" >> build/config.make
38 50
 echo "CONFIGURED_PROFILES :=$configured_profiles" >> build/config.make
  51
+echo "MOONLIGHT_SDK_LOCATION :=$sdk_location" >> build/config.make
39 52
 
40 53
 echo "mono-basic $VERSION module configure to use prefix=$prefix"
41 54
 
4  tools/moonlight/Makefile
@@ -17,11 +17,9 @@ test-local run-test-local run-test-ondotnet-local all-local install-local uninst
17 17
 dist-local: dist-default
18 18
 
19 19
 tuner.exe: tuner.vb
20  
-	$(MAKE) -C ../../vbnc
21  
-	mono --debug $(topdir)/class/lib/net_4_0/vbnc.exe tuner.vb -out:tuner.exe -r:`pkg-config --variable=Libraries cecil` -debug+
  20
+	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
22 21
 
23 22
 moonlight: tuner.exe
24  
-	$(MAKE) -C ../../vbnc
25 23
 	mkdir -p $(topdir)/class/lib/moonlight
26 24
 	$(MAKE) -C ../../vbruntime/Microsoft.VisualBasic PROFILE=moonlight
27 25
 	

0 notes on commit 2e6038e

Please sign in to comment.
Something went wrong with that request. Please try again.