[Unison-hackers] [unison-svn] r358 - branches/2.27/doc branches/2.27/src/uimacnew branches/2.32/src trunk/doc trunk/fstest trunk/src trunk/src/uimacnew

[ALAN SCHMITT]

Author: schmitta
Date: 2009-06-18 05:29:40 -0400 (Thu, 18 Jun 2009)
New Revision: 358

Modified:
   branches/2.27/doc/unison-manual.tex
   branches/2.27/src/uimacnew/
   branches/2.32/src/Makefile.OCaml
   trunk/doc/unison-manual.tex
   trunk/fstest/
   trunk/src/
   trunk/src/Makefile.OCaml
   trunk/src/uimacnew/
Log:
- svn:ignoring some files
- correcting some typos in the manual
- incorporating Makefile changes to allow specifying the minimal OS X version targeted, thanks to a patch from Martin von Gagern



Modified: branches/2.27/doc/unison-manual.tex
===================================================================
--- branches/2.27/doc/unison-manual.tex	2009-06-18 08:36:04 UTC (rev 357)
+++ branches/2.27/doc/unison-manual.tex	2009-06-18 09:29:40 UTC (rev 358)
@@ -475,7 +475,7 @@
 \noindent
 indicates that the file {\tt c} has been modified only in the second
 replica, and that the default action is therefore to propagate the new
-version to the first replica.  To {\bf f}ollw Unison's recommendation,
+version to the first replica.  To {\bf f}ollow Unison's recommendation,
 press the ``f'' at the prompt.
 
 If both replicas are modified and their contents are different, then
@@ -494,7 +494,7 @@
 
 These display conventions are used by both versions of the user
 interface.  The only difference lies in the way in which Unison's
-default actions are either accepted or overriden by the user.
+default actions are either accepted or overridden by the user.
 
 \begin{textui}
 The status of each modified file is displayed, in turn.  


Property changes on: branches/2.27/src/uimacnew
___________________________________________________________________
Name: svn:ignore
   + build
ExternalSettings.xcconfig


Modified: branches/2.32/src/Makefile.OCaml
===================================================================
--- branches/2.32/src/Makefile.OCaml	2009-06-18 08:36:04 UTC (rev 357)
+++ branches/2.32/src/Makefile.OCaml	2009-06-18 09:29:40 UTC (rev 358)
@@ -155,7 +155,7 @@
 endif
 endif
 
-MINOSXVERSION=10.5
+MINOSXVERSION=10.4
 
 # NOTE: the OCAMLLIBDIR is not getting passed correctly?
 # The two cases for cltool are needed because Xcode 2.1+

Modified: trunk/doc/unison-manual.tex
===================================================================
--- trunk/doc/unison-manual.tex	2009-06-18 08:36:04 UTC (rev 357)
+++ trunk/doc/unison-manual.tex	2009-06-18 09:29:40 UTC (rev 358)
@@ -475,7 +475,7 @@
 \noindent
 indicates that the file {\tt c} has been modified only in the second
 replica, and that the default action is therefore to propagate the new
-version to the first replica.  To {\bf f}ollw Unison's recommendation,
+version to the first replica.  To {\bf f}ollow Unison's recommendation,
 press the ``f'' at the prompt.
 
 If both replicas are modified and their contents are different, then
@@ -494,7 +494,7 @@
 
 These display conventions are used by both versions of the user
 interface.  The only difference lies in the way in which Unison's
-default actions are either accepted or overriden by the user.
+default actions are either accepted or overridden by the user.
 
 \begin{textui}
 The status of each modified file is displayed, in turn.  


Property changes on: trunk/fstest
___________________________________________________________________
Name: svn:ignore
   + build



Property changes on: trunk/src
___________________________________________________________________
Name: svn:ignore
   - *.cmx
*.cmi
*.cmo
mkProjectInfo
unison
TAGS
Makefile.ProjectInfo

   + *.cmx
*.cmi
*.cmo
mkProjectInfo
unison
TAGS
Makefile.ProjectInfo
unison.tmproj


Modified: trunk/src/Makefile.OCaml
===================================================================
--- trunk/src/Makefile.OCaml	2009-06-18 08:36:04 UTC (rev 357)
+++ trunk/src/Makefile.OCaml	2009-06-18 09:29:40 UTC (rev 358)
@@ -166,7 +166,11 @@
 endif
 endif
 
-MINOSXVERSION=10.5
+MINOSXVERSION=10.4
+XCODEFLAGS=-sdk macosx$(MINOSXVERSION)
+ifeq ($(OSARCH),osx)
+  CAMLFLAGS+=-ccopt -mmacosx-version-min=$(MINOSXVERSION)
+endif
 
 # NOTE: the OCAMLLIBDIR is not getting passed correctly?
 # The two cases for cltool are needed because Xcode 2.1+
@@ -174,7 +178,7 @@
 .PHONY: macexecutable
 macexecutable: $(NAME)-blob.o
 #	sed -e's/@@VERSION@@/$(VERSION)/' $(UIMACDIR)/Info.plist.template > $(UIMACDIR)/Info.plist
-	(cd $(UIMACDIR); xcodebuild OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
+	(cd $(UIMACDIR); xcodebuild $(XCODEFLAGS) OCAMLLIBDIR="$(OCAMLLIBDIR)" SYMROOT=build)
 	if [ -e $(UIMACDIR)/build/Default ]; then \
 	  gcc -mmacosx-version-min=$(MINOSXVERSION) $(UIMACDIR)/cltool.c -o $(UIMACDIR)/build/Default/Unison.app/Contents/MacOS/cltool -framework Carbon; \
 	else \


Property changes on: trunk/src/uimacnew
___________________________________________________________________
Name: svn:ignore
   + build
ExternalSettings.xcconfig