[Unison-hackers] Problem building unison under cygwin

[Andrew Schulman]

> So with the patch below, unison 2.40 now builds successfully in Cygwin with
> 'make OSCOMP=cygwingnuc UISTYLE=text SYSTEM=generic'.  The patch is
> Cygwin-specific-- I'm not sure what's the right set of #ifdef's and so on
> to make the changes apply only in Cygwin.

And here's the patch.

--- unison-2.40.16.orig/Makefile     2010-04-15 13:29:31.000000000 -0400
+++ unison-2.40.16/Makefile 2010-06-03 17:45:41.120443200 -0400
@@ -60,11 +60,11 @@ STATIC=false
 # NAME, VERSION, and MAJORVERSION, automatically generated
 -include Makefile.ProjectInfo

-Makefile.ProjectInfo: mkProjectInfo.ml $(wildcard ../.bzr/branch/last-revision)
-       ocaml str.cma unix.cma ./mkProjectInfo.ml > $@
+Makefile.ProjectInfo: mkProjectInfo
+       ./mkProjectInfo > $@

-#mkProjectInfo: mkProjectInfo.ml
-#      ocamlc -o $@ unix.cma str.cma $^
+mkProjectInfo: mkProjectInfo.ml
+       ocamlc -o $@ $^

 clean::
        $(RM) mkProjectInfo
@@ -348,7 +348,7 @@ tags:
            $(ETAGS) *.mli */*.mli *.ml */*.ml */*.m *.c */*.c *.txt \
           ; fi

-all:: TAGS
+#all:: TAGS

 TAGS:
        $(MAKE) tags
--- unison-2.40.16.orig/Makefile.OCaml       2010-04-15 13:29:31.000000000 -0400
+++ unison-2.40.16/Makefile.OCaml   2010-06-03 17:45:42.432901200 -0400
@@ -120,8 +120,7 @@ else
   ifeq ($(OSARCH),win32gnuc)
     CWD=.
     EXEC_EXT=.exe
-    COBJS+=system/system_win_stubs$(OBJ_EXT) lwt/lwt_unix_stubs$(OBJ_EXT)
-    WINOBJS=system/system_win.cmo
+    WINOBJS=
     SYSTEM=win
     CLIBS+=-cclib win32rc/unison.res.lib
     STATIC=false                      # Cygwin is not MinGW :-(