Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

[build] Build, use and install mcs.exe from the mono tree

We need this to build moonlight applications in our SDK and also to allow
us to build moon itself without having mono master installed as our parallel
mono. It is ok to bundle just mcs.exe and allow it to run against the system
libraries (mscolib, system.dll etc) as long as system mono is 2.10+.
  • Loading branch information...
commit be36092d3ede3a39d2786ba900280a26ffdb8eb7 1 parent a60a7bc
Alan McGovern alanmcgovern authored

Showing 24 changed files with 39 additions and 47 deletions. Show diff stats Hide diff stats

  1. +1 1  README
  2. +0 1  class/Moon.Windows.Desktop/Makefile.am
  3. +7 7 class/SecurityAttributes/Makefile.am
  4. +0 2  class/System.Windows.Browser/Makefile.am
  5. +0 2  class/System.Windows.Controls.Data/Makefile.am
  6. +0 2  class/System.Windows.Controls/Makefile.am
  7. +6 8 class/System.Windows/Makefile.am
  8. +5 2 class/tuning/Makefile.am
  9. +8 1 configure.ac
  10. +1 1  m4/examples.m4
  11. +0 1  perf/Makefile.am
  12. +2 2 scripts/smcs.in
  13. +4 2 sdk/Makefile.am
  14. +1 1  test/2.0/FakeA11yBridge/Makefile.am
  15. +1 0  test/2.0/Makefile.am
  16. +0 2  test/2.0/Microsoft.Silverlight.Testing/Makefile.am
  17. +0 2  test/2.0/Microsoft.SilverlightControls/Controls.Data.Test/Makefile.am
  18. +0 2  test/2.0/Microsoft.SilverlightControls/Controls.Extended.Test/Makefile.am
  19. +0 2  test/2.0/Microsoft.SilverlightControls/Controls.Test.Common/Makefile.am
  20. +1 0  test/2.0/Microsoft.SilverlightControls/Makefile.am
  21. +0 2  test/2.0/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight/Makefile.am
  22. +0 2  test/2.0/Mono.Moonlight.UnitTesting/Makefile.am
  23. +1 1  test/2.0/moon-unit/Makefile.am
  24. +1 1  test/leak/Makefile.am
2  README
@@ -27,7 +27,7 @@ Requirements
27 27 Do this like this:
28 28 git clone git://github.com/mono/moon.git moon
29 29 git clone git://github.com/mono/mono.git mono
30   - cd mono && git reset --hard a5c8e2a3 && cd ..
  30 + cd mono && git reset --hard b4a65091 && cd ..
31 31 git clone git://github.com/mono/mono-basic.git mono-basic
32 32 cd mono-basic && git reset --hard 4ef1fbe && cd ..
33 33
1  class/Moon.Windows.Desktop/Makefile.am
@@ -17,7 +17,6 @@ noinst_DATA = $(assemblies)
17 17
18 18 CSCFLAGS = /codepage:65001 -d:SANITY -d:NET_1_1 -d:NET_2_0 -d:MOONLIGHT -debug+ -noconfig -r:System -r:System.Core -r:System.Xml -d:AGCLR -unsafe
19 19
20   -GMCS = MONO_PATH="../lib/moonlight:$$MONO_PATH" gmcs $(CSCFLAGS) -lib:../lib/moonlight -d:NET_3_0
21 20 GACUTIL = gacutil /gacdir $(DESTDIR)$(prefix)/lib /root $(DESTDIR)$(prefix)/lib
22 21
23 22 system_windows_sources = \
14 class/SecurityAttributes/Makefile.am
@@ -71,17 +71,17 @@ all: ivt-check.exe detect.exe
71 71 mono ivt-check.exe $(TRUSTED_ASSEMBLIES)
72 72
73 73 Moonlight.SecurityModel.dll: $(securitymodel_sources)
74   - mcs $(CECIL) -debug -r:System.Core.dll -t:library -out:$@ $(securitymodel_sources)
  74 + $(MCS) $(CECIL) -debug -r:System.Core.dll -t:library -out:$@ $(securitymodel_sources)
75 75
76 76 find-sc.exe: find-sc.cs Moonlight.SecurityModel.dll
77   - mcs find-sc.cs -debug -out:$@ $(LIBS)
  77 + $(MCS) find-sc.cs -debug -out:$@ $(LIBS)
78 78
79 79 compat: find-sc.exe
80 80 mkdir -p compatibility
81 81 mono find-sc.exe $(SILVERLIGHT_PLATFORM_CODE) compatibility
82 82
83 83 detect.exe: detect.cs Moonlight.SecurityModel.dll
84   - mcs detect.cs -debug -out:$@ $(LIBS)
  84 + $(MCS) detect.cs -debug -out:$@ $(LIBS)
85 85
86 86 $(MERGED_SECURITY_ATTRIBUTES_INFO): ivt-check detect.exe $(SECURITY_ATTRIBUTES_MANUAL_INFO) $(SECURITY_ATTRIBUTES_COMPATIBILITY_INFO) $(TRUSTED_ASSEMBLIES)
87 87
@@ -91,16 +91,16 @@ validate: find-sc.exe
91 91 diff -u compatibility moonlight
92 92
93 93 audit.exe: $(srcdir)/audit.cs Moonlight.SecurityModel.dll
94   - mcs $(srcdir)/audit.cs -debug -out:$@ $(LIBS)
  94 + $(MCS) $(srcdir)/audit.cs -debug -out:$@ $(LIBS)
95 95
96 96 ivt-check.exe: $(srcdir)/ivt-check.cs Moonlight.SecurityModel.dll
97   - mcs $(srcdir)/ivt-check.cs -debug -out:$@ $(LIBS)
  97 + $(MCS) $(srcdir)/ivt-check.cs -debug -out:$@ $(LIBS)
98 98
99 99 ivt-detect.exe: $(srcdir)/ivt-detect.cs Moonlight.SecurityModel.dll
100   - mcs $(srcdir)/ivt-detect.cs -debug -out:$@ $(LIBS)
  100 + $(MCS) $(srcdir)/ivt-detect.cs -debug -out:$@ $(LIBS)
101 101
102 102 ivt-compat.exe: $(srcdir)/ivt-compat.cs Moonlight.SecurityModel.dll
103   - mcs $(srcdir)/ivt-compat.cs -debug -out:$@ $(LIBS)
  103 + $(MCS) $(srcdir)/ivt-compat.cs -debug -out:$@ $(LIBS)
104 104
105 105 # everything that we install in the plugin directory is (somewhat) trusted - even non-platform assemblies
106 106 TRUSTED_ASSEMBLIES= \
2  class/System.Windows.Browser/Makefile.am
@@ -22,8 +22,6 @@ if SANITY
22 22 CSCFLAGS += -d:SANITY
23 23 endif
24 24
25   -GMCS = gmcs $(CSCFLAGS) -lib:../lib/moonlight -r:System.Core.dll
26   -SMCS = mcs -nostdlib -lib:../lib/2.1 -r:mscorlib.dll $(CSCFLAGS) -r:System.Core.dll
27 25 GACUTIL = gacutil /gacdir $(DESTDIR)$(prefix)/lib /root $(DESTDIR)$(prefix)/lib
28 26 monoloc = `pkg-config --variable=libdir mono`/mono/moonlight
29 27 nunit = -r:$(monoloc)/nunit.framework.dll -r:$(monoloc)/nunit.core.dll -r:$(monoloc)/nunit.util.dll
2  class/System.Windows.Controls.Data/Makefile.am
@@ -14,8 +14,6 @@ noinst_DATA = $(assemblies)
14 14
15 15 CSCFLAGS = /codepage:65001 -d:NET_1_1 -d:NET_2_0 -debug+ -noconfig -r:System -r:System.Core -r:System.Windows -d:AGCLR -unsafe
16 16
17   -GMCS = gmcs $(CSCFLAGS) -lib:../lib/moonlight
18   -SMCS = mcs -nostdlib -lib:../lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
19 17 GACUTIL = gacutil /gacdir $(DESTDIR)$(prefix)/lib /root $(DESTDIR)$(prefix)/lib
20 18 monoloc = `pkg-config --variable=libdir mono`/mono/moonlight
21 19
2  class/System.Windows.Controls/Makefile.am
@@ -14,8 +14,6 @@ noinst_DATA = $(assemblies)
14 14
15 15 CSCFLAGS = /codepage:65001 -d:NET_1_1 -d:NET_2_0 -debug+ -noconfig -r:System -r:System.Windows -d:AGCLR -unsafe -r:System.Core.dll
16 16
17   -GMCS = gmcs $(CSCFLAGS) -lib:../lib/moonlight
18   -SMCS = mcs -nostdlib -lib:../lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
19 17 GACUTIL = gacutil /gacdir $(DESTDIR)$(prefix)/lib /root $(DESTDIR)$(prefix)/lib
20 18 monoloc = `pkg-config --variable=libdir mono`/mono/moonlight
21 19
14 class/System.Windows/Makefile.am
... ... @@ -1,7 +1,7 @@
1 1 assembly = System.Windows
2 2
3 3 NET_2_1_ASSEMBLY_DEPS=-r:System.Runtime.Serialization.dll
4   -NET_3_0_ASSEMBLY_DEPS=
  4 +NET_3_0_ASSEMBLY_DEPS=-r:System.Net.dll
5 5
6 6 sl_secattr = ../SecurityAttributes/$(assembly).secattr
7 7
@@ -12,7 +12,7 @@ assemblysl_raw = ../lib/2.1_raw/$(assembly).dll
12 12 bootstrap_assemblysl = ../lib/2.1-bootstrap/$(assembly).dll
13 13 bootstrap_assemblysl_raw = ../lib/2.1_raw-bootstrap/$(assembly).dll
14 14
15   -NONBOOTSTRAP_FLAGS_2_1= -r:../lib/2.1/System.Windows.Browser.dll
  15 +NONBOOTSTRAP_FLAGS_2_1= -r:../lib/2.1/System.Windows.Browser.dll -r:System.Net.dll
16 16 endif
17 17
18 18 if INCLUDE_DESKTOP_MANAGED_CODE
@@ -20,7 +20,7 @@ assemblydesktop = ../lib/moonlight/$(assembly).dll
20 20
21 21 bootstrap_assemblydesktop = ../lib/moonlight-bootstrap/$(assembly).dll
22 22
23   -NONBOOTSTRAP_FLAGS_DESKTOP= -r:../lib/moonlight/System.Windows.Browser.dll
  23 +NONBOOTSTRAP_FLAGS_DESKTOP= -r:../lib/moonlight/System.Windows.Browser.dll -r:System.Net.dll
24 24
25 25 config = $(assemblydesktop).config
26 26 endif
@@ -40,8 +40,6 @@ if HEAPVIZ
40 40 CSCFLAGS += -d:HEAPVIZ
41 41 endif
42 42
43   -GMCS = MONO_PATH="../lib/moonlight:../lib/moonlight-bootstrap:$$MONO_PATH" gmcs $(CSCFLAGS) -lib:../lib/moonlight,../lib/moonlight-bootstrap -d:NET_3_0
44   -SMCS = mcs -nostdlib -lib:../lib/2.1 -r:mscorlib.dll -r:System.Net $(CSCFLAGS)
45 43 GACUTIL = gacutil /gacdir $(DESTDIR)$(prefix)/lib /root $(DESTDIR)$(prefix)/lib
46 44
47 45 MSRUNTIMECONTROLS=$(srcdir)/../Microsoft.SilverlightControls/RuntimeControls/SilverlightControls
@@ -913,12 +911,12 @@ uninstall-local:
913 911 check-code: check-static check-dynamic
914 912
915 913 check-static:
916   - gmcs $(srcdir)/scripts/checks.cs -r:../lib/moonlight/System.Windows.dll -out:check-static.exe
  914 + $(GMCS) $(srcdir)/scripts/checks.cs -r:../lib/moonlight/System.Windows.dll -out:check-static.exe
917 915 MONO_PATH=../lib/moonlight:$$MONO_PATH mono --debug check-static.exe
918 916 > check-static
919 917
920 918 check-dynamic:
921   - gmcs $(srcdir)/scripts/checks.cs -r:../lib/moonlight/System.Windows.dll -out:check-static.exe
  919 + $(GMCS) $(srcdir)/scripts/checks.cs -r:../lib/moonlight/System.Windows.dll -out:check-static.exe
922 920 mono --debug check-static.exe generate-test-code > tester.cs
923   - gmcs tester.cs -r:../lib/moonlight/System.Windows.dll -debug:full -nowarn:219
  921 + $(GMCS) tester.cs -r:../lib/moonlight/System.Windows.dll -debug:full -nowarn:219
924 922 MONO_PATH=../lib/moonlight:$$MONO_PATH mono --debug tester.exe
7 class/tuning/Makefile.am
@@ -26,6 +26,8 @@ MCS_ASSEMBLIES = \
26 26
27 27 MCS_DLLFILES = $(MCS_ASSEMBLIES:%=$(MCS_PATH)/class/lib/moonlight_raw/%.dll)
28 28
  29 +MCS_COMPILER = $(MCS_PATH)/mcs/mcs.exe
  30 +
29 31 if HAVE_MONO_BASIC
30 32 MONO_BASIC_TUNER_ASSEMBLIES = Microsoft.VisualBasic
31 33 MONO_BASIC_DLLFILES = $(MONO_BASIC_PATH)/class/lib/2.1/Microsoft.VisualBasic.dll
@@ -89,13 +91,14 @@ $(MONO_BASIC_DLLFILES):
89 91 $(MAKE) -C $(MONO_BASIC_PATH)/tools/moonlight tune
90 92 endif
91 93
92   -working.stamp: $(INPUT_FILES)
  94 +working.stamp: $(INPUT_FILES) $(MCS_COMPILER)
93 95 -mkdir -p $(WORKING_DIR)
94 96 for i in $(INPUT_FILES); do cp -p $$i $$i.mdb $(WORKING_DIR); done
95 97 -rm $(WORKING_DIR)/Microsoft.VisualBasic.dll.mdb
  98 + cp $(MCS_COMPILER) ../lib
96 99 touch $(WORKING_FILES) working.stamp
97 100
98   -output.stamp: working.stamp $(top_srcdir)/class/lib/tuner/Mono.Tuner.dll
  101 +output.stamp: working.stamp $(top_srcdir)/class/lib/tuner/Mono.Tuner.dll $(MCS_COMPILER)
99 102 MONO_PATH="../lib/tuner:$$MONO_PATH" $(LINKER) $(TUNER_FLAGS) $(TUNER_DESCS:%=-x %) $(TUNER_STEPS:%=-s %) $(TUNER_MASTERS:%=-i %)
100 103 for i in $(DLLFILES); do sn -q -R $(OUTPUT_DIR)/$$i $(srcdir)/../mono.snk; done
101 104 -mkdir -p $(MCS_OUTPUT_DIR)
9 configure.ac
@@ -100,6 +100,13 @@ dnl
100 100 dnl Export Variables
101 101 dnl
102 102
  103 +GMCS="mono \$(abs_top_builddir)/class/lib/mcs.exe \$(CSCFLAGS) -sdk:2 -lib:\$(abs_top_builddir)/class/lib/moonlight,\$(abs_top_builddir)/class/lib/moonlight-bootstrap,\$(abs_top_builddir)/class/lib/2.1_raw -d:NET_3_0"
  104 +SMCS="mono \$(abs_top_builddir)/class/lib/mcs.exe \$(CSCFLAGS) -nostdlib -lib:\$(abs_top_builddir)/class/lib/2.1 -r:mscorlib.dll -r:System.Net"
  105 +MCS="mono \$(abs_top_builddir)/class/lib/mcs.exe \$(CSCFLAGS) -lib:\$(abs_top_builddir)/class/lib/moonlight,\$(abs_top_builddir)/class/lib/moonlight-bootstrap"
  106 +AC_SUBST(GMCS)
  107 +AC_SUBST(SMCS)
  108 +AC_SUBST(MCS)
  109 +
103 110 AC_PATH_PROG(GACUTIL, gacutil)
104 111 AC_SUBST([MOONLIGHT_MONO], [$MONO_PATH/mono/mini/mono])
105 112 AC_SUBST([SYSTEM_MONO], mono)
@@ -113,7 +120,7 @@ PERF_TOOL_LIBS="$MONO_LIBS $GTK_LIBS $XULRUNNER_LIBS"
113 120 AC_SUBST(PERF_TOOL_CFLAGS)
114 121 AC_SUBST(PERF_TOOL_LIBS)
115 122
116   -MONO_LIBS="-lmono-2.0 -L$MONO_PATH/mono/mini -L$MONO_PATH/mono/mini/.libs"
  123 +MONO_LIBS="-lmono-moon -L$MONO_PATH/mono/mini -L$MONO_PATH/mono/mini/.libs"
117 124 MONO_STATIC_LIBS="$MONO_PATH/mono/mini/libmono-moon.la"
118 125 MOON_CFLAGS="$GLIB_CFLAGS $CAIRO_CFLAGS $FREETYPE2_CFLAGS $FONTCONFIG_CFLAGS $GTK_CFLAGS $ALSA_CFLAGS $PULSEAUDIO_CFLAGS $FFMPEG_CFLAGS $MONO_CFLAGS $DBUS_CFLAGS $CURL_CFLAGS"
119 126 dnl MOON_LIBS is partially defined above for the user-plugin build
2  m4/examples.m4
@@ -5,7 +5,7 @@ AC_DEFUN([MOONLIGHT_CHECK_EXAMPLES],
5 5 dnl examples
6 6 dnl
7 7
8   - AC_ARG_WITH(examples, [ --with-examples=yes|no Enable examples (defaults=yes)],[],[with_examples=yes])
  8 + AC_ARG_WITH(examples, [ --with-examples=yes|no Enable examples (defaults=no)],[],[with_examples=no])
9 9
10 10 AM_CONDITIONAL(INCLUDE_EXAMPLES, test x$with_examples = xyes)
11 11
1  perf/Makefile.am
@@ -11,7 +11,6 @@ perf_tool_SOURCES = \
11 11
12 12 perf_tool_LDADD = $(PERF_TOOL_LIBS) $(MOON_PROG_LIBS)
13 13
14   -MCS = dmcs
15 14 RUNTIME = mono
16 15
17 16 MCS_LIB_FLAGS = -r:Mono.Data.Sqlite -r:System.Data
4 scripts/smcs.in
@@ -16,8 +16,8 @@ do
16 16 done
17 17
18 18 if [ x$profile = xdesktop ] ; then
19   -mcs -lib:@prefix@/lib/$libdir -r:mscorlib.dll -r:System.dll -r:System.Core.dll "$@"
  19 +mono @prefix@/lib/moonlight/mcs.exe -lib:@prefix@/lib/$libdir -r:mscorlib.dll -r:System.dll -r:System.Core.dll "$@"
20 20 else
21   -mcs -lib:@prefix@/lib/$libdir -r:mscorlib.dll -r:System.dll -r:System.Windows.dll -r:System.Windows.Browser.dll -r:System.Core.dll -r:System.Net.dll -r:System.Xml.dll "$@"
  21 +mono @prefix@/lib/moonlight/mcs.exe -lib:@prefix@/lib/$libdir -r:mscorlib.dll -r:System.dll -r:System.Windows.dll -r:System.Windows.Browser.dll -r:System.Core.dll -r:System.Net.dll -r:System.Xml.dll "$@"
22 22 fi
23 23
6 sdk/Makefile.am
@@ -11,7 +11,7 @@ make-sdk-directories:
11 11 @mkdir -p $(SDK4_DIR)
12 12 @mkdir -p $(SDK4_REDIST_DIR)
13 13
14   -install-data-local: make-sdk-directories install-buildversion install-sdk-assemblies install-sdk-tools install-redist-assemblies
  14 +install-data-local: make-sdk-directories install-buildversion install-sdk-assemblies install-sdk-tools install-redist-assemblies install-compiler
15 15
16 16 install-buildversion:
17 17 @echo $(SILVERLIGHT_4_0_TARGETRUNTIME) > buildversion
@@ -57,7 +57,9 @@ install-redist-assemblies:
57 57 -$(INSTALL) $(CLASS_DIR)/System.Xml.Linq.dll.mdb $(SDK4_REDIST_DIR)/System.Xml.Linq.dll.mdb
58 58 $(INSTALL) $(CLASS_DIR)/System.Xml.Serialization.dll $(SDK4_REDIST_DIR)/System.Xml.Serialization.dll
59 59 -$(INSTALL) $(CLASS_DIR)/System.Xml.Serialization.dll.mdb $(SDK4_REDIST_DIR)/System.Xml.Serialization.dll.mdb
60   -
  60 +
  61 +install-compiler:
  62 + $(INSTALL) $(CLASS_DIR)/../mcs.exe $(SDK_ROOT)/mcs.exe
61 63
62 64 clean-local:
63 65 -rm -rf buildversion
2  test/2.0/FakeA11yBridge/Makefile.am
... ... @@ -1,5 +1,5 @@
1 1 #don't define MOONLIGHT_ONLY when compiling on MS.NET
2   -SMCS = mcs -nostdlib -lib:../lib/2.1 -r:mscorlib.dll $(CSCFLAGS) -codepage:utf8 -keyfile:mono-uia.snk -target:library -define:MOONLIGHT_ONLY
  2 +CSCFLAGS = -codepage:utf8 -keyfile:mono-uia.snk -target:library -define:MOONLIGHT_ONLY
3 3
4 4 EXTRA_DIST = \
5 5 $(srcdir)/*.cs \
1  test/2.0/Makefile.am
@@ -9,3 +9,4 @@ SUBDIRS= \
9 9 Mono.Moonlight.UnitTesting \
10 10 Microsoft.SilverlightControls \
11 11 moon-unit
  12 +
2  test/2.0/Microsoft.Silverlight.Testing/Makefile.am
@@ -4,8 +4,6 @@ if HEAPVIZ
4 4 CSCFLAGS += -d:HEAPVIZ
5 5 endif
6 6
7   -SMCS = mcs -nostdlib -lib:../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
8   -
9 7 SOURCES = \
10 8 $(srcdir)/UnitTestHarness/AsynchronousAttribute.cs\
11 9 $(srcdir)/UnitTestHarness/BugAttribute.cs\
2  test/2.0/Microsoft.SilverlightControls/Controls.Data.Test/Makefile.am
@@ -25,8 +25,6 @@ REFERENCES = \
25 25
26 26 CSCFLAGS = /codepage:65001 -d:SILVERLIGHT -d:MOONLIGHT -target:library -debug+ -noconfig $(REFERENCES)
27 27
28   -SMCS = mcs -nostdlib -lib:../../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
29   -
30 28 FILES= $(shell cat $(srcdir)/$(assembly).sources)
31 29 SOURCES = $(foreach file,$(FILES),$(SDK_SRCDIR)/$(file))
32 30 SOURCES += $(srcdir)/App.xaml.g.cs
2  test/2.0/Microsoft.SilverlightControls/Controls.Extended.Test/Makefile.am
@@ -25,8 +25,6 @@ REFERENCES = \
25 25
26 26 CSCFLAGS = /codepage:65001 -d:SILVERLIGHT -d:MOONLIGHT -target:library -debug+ -noconfig $(REFERENCES)
27 27
28   -SMCS = mcs -nostdlib -lib:../../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
29   -
30 28 FILES = $(shell cat $(srcdir)/ControlsExtended.Test.sources)
31 29 SOURCES = $(foreach file,$(FILES),$(SDK_SRCDIR)/$(file))
32 30 SOURCES += $(srcdir)/App.xaml.g.cs
2  test/2.0/Microsoft.SilverlightControls/Controls.Test.Common/Makefile.am
@@ -17,8 +17,6 @@ REFERENCES = \
17 17
18 18 CSCFLAGS = /codepage:65001 -d:SILVERLIGHT -debug+ -noconfig $(REFERENCES)
19 19
20   -SMCS = mcs -nostdlib -lib:../../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
21   -
22 20 sources = \
23 21 $(SDK_SRCDIR)/Common.cs \
24 22 $(SDK_SRCDIR)/LiveReference.cs \
1  test/2.0/Microsoft.SilverlightControls/Makefile.am
@@ -49,3 +49,4 @@ resign:
49 49 -cp $(RESIGN_DLL).mdb .
50 50
51 51 install:
  52 +
2  test/2.0/Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight/Makefile.am
... ... @@ -1,5 +1,3 @@
1   -SMCS = mcs -nostdlib -lib:../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
2   -
3 1 noinst_DATA= Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll
4 2
5 3 CLEANFILES=Microsoft.VisualStudio.QualityTools.UnitTesting.Silverlight.dll \
2  test/2.0/Mono.Moonlight.UnitTesting/Makefile.am
... ... @@ -1,5 +1,3 @@
1   -SMCS = mcs -nostdlib -lib:../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS)
2   -
3 1 noinst_DATA= Mono.Moonlight.UnitTesting.dll
4 2
5 3 SOURCES = \
2  test/2.0/moon-unit/Makefile.am
@@ -152,7 +152,7 @@ moon-unit.g.resources:
152 152
153 153 moon-unit.dll: moon-unit.sources moon-unit.g.resources $(CODE_BEHINDS) $(DLLS_TO_EMBED)
154 154 @echo Compiling moon-unit.dll
155   - mcs -nostdlib -lib:../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS) -d:TEST -d:NET_2_1 -d:CONTRACTS_FULL -debug+ -target:library -out:moon-unit.dll -r:System.Net.dll $(BROWSER_ASSEMBLIES) $(REFERENCES) @$(top_builddir)/test/2.0/moon-unit/moon-unit.sources $(CODE_BEHINDS) -resource:moon-unit.g.resources -warnaserror+
  155 + mono ../../../class/lib/mcs.exe -nostdlib -lib:../../../class/lib/2.1 -r:mscorlib.dll $(CSCFLAGS) -d:TEST -d:NET_2_1 -d:CONTRACTS_FULL -debug+ -target:library -out:moon-unit.dll -r:System.Net.dll $(BROWSER_ASSEMBLIES) $(REFERENCES) @$(top_builddir)/test/2.0/moon-unit/moon-unit.sources $(CODE_BEHINDS) -resource:moon-unit.g.resources -warnaserror+
156 156
157 157
158 158 define XAP_TEMPLATE
2  test/leak/Makefile.am
@@ -16,7 +16,7 @@ $(XAPS): %Leak.xap: $(BUILD_FILES) %Test.cs
16 16 @cp $(BUILD_FILES) $*
17 17 @-(cd $* && $(SYSTEM_MONO) $(abs_top_builddir)/tools/xamlg/xamlg.exe -sl2app:Leak $(XAML_FILES))
18 18 @-(cd $* && $(SYSTEM_MONO) $(abs_top_builddir)/tools/respack/respack.exe Leak.g.resources $(XAML_FILES))
19   - @-(cd $* && mcs -nostdlib -lib:$(abs_top_builddir)/class/lib/2.1 -r:mscorlib.dll -debug+ -r:System.Windows.dll -r:System.Windows.Browser.dll -target:library -out:Leak.dll -resource:Leak.g.resources -warnaserror+ $(SOURCE_FILES) Test.cs $(addsuffix .g.cs,$(XAML_FILES)))
  19 + @-(cd $* && $(SMCS) -debug+ -r:System.Windows.dll -r:System.Windows.Browser.dll -target:library -out:Leak.dll -resource:Leak.g.resources -warnaserror+ $(SOURCE_FILES) Test.cs $(addsuffix .g.cs,$(XAML_FILES)))
20 20 @-(cd $* && zip -q Leak.xap Leak.dll Leak.dll.mdb AppManifest.xaml Leak.dll Leak.dll.mdb)
21 21 @cp Leak.html $*
22 22

0 comments on commit be36092

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