[Unison-hackers] [unison-svn] r386 - in trunk/src: . ubase uimacnew/uimacnew.xcodeproj

[bcpierce@seas.upenn.edu]

Author: bcpierce
Date: 2009-08-10 21:46:31 -0400 (Mon, 10 Aug 2009)
New Revision: 386

Modified:
   trunk/src/Makefile
   trunk/src/Makefile.OCaml
   trunk/src/RECENTNEWS
   trunk/src/mkProjectInfo.ml
   trunk/src/ubase/depend
   trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
Log:
* Makefile tweak: don't complain if etags is not found (I hope I got my bash syntax right...)


Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/Makefile	2009-08-11 01:46:31 UTC (rev 386)
@@ -344,7 +344,9 @@
 .PHONY: tags
 
 tags:
-	-$(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt
+	-if [ -f `which $(ETAGS)` ]; then \
+	    $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
+          ; fi 
 
 all:: TAGS
 

Modified: trunk/src/Makefile.OCaml
===================================================================
--- trunk/src/Makefile.OCaml	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/Makefile.OCaml	2009-08-11 01:46:31 UTC (rev 386)
@@ -166,8 +166,8 @@
 endif
 endif
 
-MINOSXVERSION=10.4
-XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
+MINOSXVERSION=10.5
+# XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
 ifeq ($(OSARCH),osx)
   CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
 endif
@@ -176,7 +176,7 @@
 # The two cases for cltool are needed because Xcode 2.1+
 # builds in build/Default/, and earlier versions use build/
 .PHONY: macexecutable
-macexecutable: $(NAME)-blob.o
+macexecutable: 
 #	sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
 	(cd $(UIMACDIR); xcodebuild $(XCODEFLAGS) OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
 	if [ -e $(UIMACDIR)/build/Default ]; then \
@@ -401,10 +401,18 @@
 # files, so we have to use $(LD) to take care of COBJS.
 $(NAME)-blob.o: $(CAMLOBJS) $(COBJS)
 	@echo Linking $@
-	$(CAMLC) -output-obj -verbose $(CAMLFLAGS) -o u-b.o $(CFLAGS) $(CAMLLIBS) $(CLIBS) $(CAMLOBJS)
-	$(LD) -r -o $@ u-b.o $(COBJS)
+	$(CAMLC) -dstartup -output-obj -verbose -cclib -keep_private_externs $(CAMLFLAGS) -o u-b.o $(CFLAGS) $(CAMLLIBS) $(CLIBS) $(CAMLOBJS)
+	$(LD) -r -keep_private_externs -o $@ u-b.o $(COBJS)
 	$(RM) u-b.o
 
+
+# Original:
+# $(NAME)-blob.o: $(CAMLOBJS) $(COBJS)
+# 	@echo Linking $@
+# 	$(CAMLC) -output-obj -verbose $(CAMLFLAGS) -o u-b.o $(CFLAGS) $(CAMLLIBS) $(CLIBS) $(CAMLOBJS)
+# 	$(LD) -r -o $@ u-b.o $(COBJS)
+# 	$(RM) u-b.o
+
 %$(EXEC_EXT): %.ml
 	$(OCAMLC) -verbose -o $@ $^
 

Modified: trunk/src/RECENTNEWS
===================================================================
--- trunk/src/RECENTNEWS	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/RECENTNEWS	2009-08-11 01:46:31 UTC (rev 386)
@@ -1,5 +1,10 @@
 CHANGES FROM VERSION 2.37.5
 
+* Makefile tweak: don't complain if etags is not found (I hope I got my bash syntax right...)
+
+-------------------------------
+CHANGES FROM VERSION 2.37.5
+
 * Transfer by rsync: fixed string token length overflow due to recent
   changes in block size.
 

Modified: trunk/src/mkProjectInfo.ml
===================================================================
--- trunk/src/mkProjectInfo.ml	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/mkProjectInfo.ml	2009-08-11 01:46:31 UTC (rev 386)
@@ -102,3 +102,4 @@
 
 
 
+

Modified: trunk/src/ubase/depend
===================================================================
--- trunk/src/ubase/depend	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/ubase/depend	2009-08-11 01:46:31 UTC (rev 386)
@@ -2,6 +2,8 @@
 myMap.cmx: myMap.cmi 
 prefs.cmo: util.cmi uarg.cmi safelist.cmi prefs.cmi 
 prefs.cmx: util.cmx uarg.cmx safelist.cmx prefs.cmi 
+proplist.cmo: util.cmi proplist.cmi 
+proplist.cmx: util.cmx proplist.cmi 
 rx.cmo: rx.cmi 
 rx.cmx: rx.cmi 
 safelist.cmo: safelist.cmi 
@@ -14,5 +16,12 @@
 uprintf.cmx: uprintf.cmi 
 util.cmo: uprintf.cmi safelist.cmi util.cmi 
 util.cmx: uprintf.cmx safelist.cmx util.cmi 
+myMap.cmi: 
 prefs.cmi: util.cmi 
+proplist.cmi: 
+rx.cmi: 
+safelist.cmi: 
 trace.cmi: prefs.cmi 
+uarg.cmi: 
+uprintf.cmi: 
+util.cmi: 

Modified: trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj
===================================================================
--- trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj	2009-08-10 12:57:43 UTC (rev 385)
+++ trunk/src/uimacnew/uimacnew.xcodeproj/project.pbxproj	2009-08-11 01:46:31 UTC (rev 386)
@@ -664,6 +664,7 @@
 					"-Wno-unknown-pragmas",
 				);
 				WRAPPER_EXTENSION = app;
+				ZERO_LINK = NO;
 			};
 			name = Default;
 		};
@@ -682,7 +683,7 @@
 			baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */;
 			buildSettings = {
 				LIBRARY_SEARCH_PATHS = "";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
 			};
 			name = Deployment;
@@ -692,7 +693,7 @@
 			baseConfigurationReference = 2E282CCC0D9AE2E800439D01 /* ExternalSettings.xcconfig */;
 			buildSettings = {
 				LIBRARY_SEARCH_PATHS = "";
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT = /Developer/SDKs/MacOSX10.5.sdk;
 				USER_HEADER_SEARCH_PATHS = $OCAMLLIBDIR;
 			};
 			name = Default;