[mono/monomac] [2 commits] 1819f5d5: samples: build with XS or MD; clean up MicroSamples build

   Branch: refs/heads/master
     Home: https://github.com/mono/monomac
  Compare: https://github.com/mono/monomac/compare/ba5cfa2dc5a1...c85182ca8346

   Commit: 1819f5d54767e04e7801f21672b6646e8d477ff7
   Author: Aaron Bockover <[email protected]> (abock)
     Date: 2013-10-22 01:25:08 GMT
      URL: https://github.com/mono/monomac/commit/1819f5d54767e04e7801f21672b6646e8d477ff7

samples: build with XS or MD; clean up MicroSamples build

Changed paths:
  M samples/Makefile
  M samples/MicroSamples/Makefile

Modified: samples/Makefile
===================================================================
@@ -1,4 +1,6 @@
-MDTOOL=/Applications/MonoDevelop.app/Contents/MacOS/mdtool
+MDROOT = $(shell stat -f%N "/Applications/Xamarin Studio.app" 2>/dev/null || echo "/Applications/MonoDevelop.app")
+MDROOT_ESCAPED = $(shell echo "$(MDROOT)" | sed 's| |\\ |g')
+MDTOOL = $(MDROOT)/Contents/MacOS/mdtool
 
 XDIRS = \
 	NSAlert					\
@@ -53,10 +55,9 @@ XDIRS = \
 	WhereIsMyMac
 
 all:
-	for i in $(XDIRS); do (cd $$i; $(MDTOOL) build); done
-	(cd MicroSamples; make)
+	-for i in $(XDIRS); do (cd $$i && "$(MDTOOL)" build) || exit $$?; done
+	$(MAKE) -C MicroSamples
 
 clean:
-	-for i in $(DIRS); do (cd $$i; make clean); done
-	-for i in $(XDIRS); do (cd $$i; rm -rf bin); done
-	-(cd MicroSamples; rm -rf *.exe *.mdb)
+	-for i in $(XDIRS); do (cd $$i && rm -rf bin) || exit $$?; done
+	$(MAKE) -C MicroSamples clean

Modified: samples/MicroSamples/Makefile
===================================================================
@@ -1,18 +1,25 @@
+MONOMAC_DLL = ../../src/MonoMac.dll
+
 DEMOS = \
 	generate-pdf.exe	\
 	locator.exe		\
 	HelloCoreWlanSample.exe		
 
+.PHONY: all clean
+
 all: $(DEMOS)
 
-run1:
-	MONO_PATH=../../src/ mono generate-pdf.exe
+clean:
+	rm -f *.dll *.exe demo.pdf
+
+MonoMac.dll: $(MONOMAC_DLL)
+	cp "$<" $@
 
-generate-pdf.exe: generate-pdf.cs
-	gmcs generate-pdf.cs -r:../../src/MonoMac.dll -r:System.Drawing
+generate-pdf.exe: MonoMac.dll generate-pdf.cs
+	gmcs generate-pdf.cs -r:MonoMac.dll -r:System.Drawing
 
-locator.exe: locator.cs
-	gmcs locator.cs -r:../../src/MonoMac.dll 
+locator.exe: MonoMac.dll locator.cs
+	gmcs locator.cs -r:MonoMac.dll
 
-HelloCoreWlanSample.exe: HelloCoreWlanSample.cs
-	gmcs HelloCoreWlanSample.cs -r:../../src/MonoMac.dll
+HelloCoreWlanSample.exe: MonoMac.dll HelloCoreWlanSample.cs
+	gmcs HelloCoreWlanSample.cs -r:MonoMac.dll

   Commit: c85182ca8346a09ead89d3469625609dd21129a7
   Author: Aaron Bockover <[email protected]> (abock)
     Date: 2013-10-22 01:25:42 GMT
      URL: https://github.com/mono/monomac/commit/c85182ca8346a09ead89d3469625609dd21129a7

maccore: bump for PR#56; add CGDataConsumer

Changed paths:
  M maccore
  M src/Make.shared

Modified: maccore
===================================================================
@@ -1 +1 @@
-Subproject commit c56ff209497cf0fbbfeff3f5696eda58670facf7
+Subproject commit a250c4d9f2d670e2d2f89dfc95b143b25fc15dd1

Modified: src/Make.shared
===================================================================
@@ -54,6 +54,7 @@ SHARED_SOURCE = \
 	./CoreFoundation/CFWriteStream.cs		\
 	./CoreFoundation/CFType.cs			\
 	./CoreGraphics/CGContextPDF.cs			\
+	./CoreGraphics/CGDataConsumer.cs		\
 	./CoreGraphics/CGDataProvider-2.cs		\
 	./CoreGraphics/CGFunction.cs			\
 	./CoreGraphics/CGPDFArray.cs			\


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches