Re: unison-2.10.2-1 and unison-gtk2-2.10.2-1

["Gerrit P. Haase" <gp at familiehaase dot de>]

Hello Andrew,

I finally finished the review.

> unison:

2.10.2 as text version rebuilds fine, though I would prefer some kind
of script which does all the work for me, I didn't tried to build the
2.9.x version.

GTG for the text version.


> unison-gtk2:

This is difficult to test without having a ready to run LablGtk
package.

Then, accoprding to your README, there are needed for the build:
gmodule-2.0.lib
glib-2.0.lib
gdk-win32-2.0.lib
gtk-win32-2.0.lib

I'm not sure if this is a good idea to depend on third party
libraries.  Rebuilding is really difficult with this prerequisites.

I have done a Cygwin package of LablGtk now, just add the Cygwin
specific README and sign it with your name, if there are no objections
it will be included in the netrelease and unison-gtk2 is GTG, once we
found the reason why I needed to apply the beloow changes.  Fetch the
LablGtk package here: http://194.95.224.180/lablgtk/

For me unison-gtk2 seems not to build as is (from your tarball),
however I can run my self compiled executable, though as noted above,
I needed to apply the below changes to be independant from .lib
libraries and to get it to link at all (works for me only with
NATIVE=false) and a build script would be very helpful.

Please review the below changes to be independant from some
third party .lib files which I don't want to use for a Cygwin
package.  What else to mention is that my unison-gtk2 executable is
linked also against libncurses.


diff -urd unison-gtk2-2.10.2-orig/Makefile unison-gtk2-2.10.2/Makefile
--- unison-gtk2-2.10.2-orig/Makefile    2004-09-06 21:15:46.000000000 +0200
+++ unison-gtk2-2.10.2/Makefile 2004-09-17 22:05:32.697076800 +0200
@@ -11,7 +11,7 @@
 # If you set NATIVE=false, then make sure that the THREADS option below is
 # also set to false unless your OCaml installation has true posix-compliant
 # threads (i.e., -with-pthreads was given as an option to the config script).
-NATIVE=true
+NATIVE=false
 
 # Use THREADS=false if your OCaml installation is not configured with the
 # -with-pthreads option.  (Unison will crash when compiled with THREADS=true
diff -urd unison-gtk2-2.10.2-orig/Makefile.OCaml unison-gtk2-2.10.2/Makefile.OCaml
--- unison-gtk2-2.10.2-orig/Makefile.OCaml      2004-09-10 15:52:20.000000000 +0200
+++ unison-gtk2-2.10.2/Makefile.OCaml   2004-09-17 21:55:58.847971200 +0200
@@ -25,7 +25,7 @@
 
 ifeq (${OSCOMP},cygwingnuc) # Define this if compiling with Cygwin GNU C
   OSARCH=win32gnuc
-  ETAGS=c:/emacs/bin/etags
+  ETAGS=/bin/etags
   buildexecutable:: win32rc/unison.res.lib   
 else
 # Win32 system
@@ -60,7 +60,7 @@
 # to Unix '/' separators, and extraneous control-M's are deleted.
 # Unfortunately there is a literal control-M buried in this, I'd rather
 # get rid of it...
-OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g' | sed -e 's/
//g')
+OCAMLLIBDIR=$(shell ocamlc -v | tail -1 | sed -e 's/.* //g' | sed -e 's/\\/\//g')
 
 # User interface style: 
 #   Legal values are
@@ -296,16 +296,16 @@
 #               -cclib gdi32.lib -cclib imm32.lib -cclib shell32.lib \
 #               -cclib ole32.lib -cclib uuid.lib
       CLIBS+=-cclib -llablgtk \
-           -cclib $(GUILIBDIR)/glib-2.0.lib \
-           -cclib $(GUILIBDIR)/gmodule-2.0.lib \
-           -cclib $(GUILIBDIR)/gdk-2.0.lib \
-           -cclib $(GUILIBDIR)/gtk-2.0.lib \
+           -cclib /usr/lib/libglib.dll.a \
+           -cclib /usr/lib/libgmodule.dll.a \
+           -cclib /usr/lib/libgdk.dll.a \
+           -cclib /usr/lib/libgtk.dll.a \
            $(WINSYSLIBS)
       STATICLIBS+=-cclib -llablgtk \
-                -cclib $(GUILIBDIR)/cclibs/glib-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gmodule-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gdk-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gtk-2.0.lib \
+                -cclib /usr/lib/libglib.a \
+                -cclib /usr/lib/libgmodule.a \
+                -cclib /usr/lib/libgdk.a \
+                -cclib /usr/lib/libgtk.a \
                 $(WINSYSLIBS)
     else
       ifeq ($(OSARCH), solaris)
@@ -352,16 +352,16 @@
 #               -cclib gdi32.lib -cclib imm32.lib -cclib shell32.lib \
 #               -cclib ole32.lib -cclib uuid.lib
       CLIBS+=-cclib -llablgtk2 \
-           -cclib $(GUILIBDIR)/glib-2.0.lib \
-           -cclib $(GUILIBDIR)/gmodule-2.0.lib \
-           -cclib $(GUILIBDIR)/gdk-2.0.lib \
-           -cclib $(GUILIBDIR)/gtk-2.0.lib \
+           -cclib /usr/lib/libglib-2.0.dll.a \
+           -cclib /usr/lib/libglib-2.0.dll.a \
+           -cclib /usr/lib/libgdk-x11-2.0.dll.a \
+           -cclib /usr/lib/libgtk-x11-2.0.dll.a \
            $(WINSYSLIBS)
       STATICLIBS+=-cclib -llablgtk2 \
-                -cclib $(GUILIBDIR)/cclibs/glib-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gmodule-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gdk-2.0.lib \
-                -cclib $(GUILIBDIR)/cclibs/gtk-2.0.lib \
+                -cclib /usr/lib/libglib-2.0.dll.a \
+                -cclib /usr/lib/libglib-2.0.dll.a \
+                -cclib /usr/lib/libgdk-x11-2.0.dll.a \
+                -cclib /usr/lib/libgtk-x11-2.0.dll.a \
                 $(WINSYSLIBS)
     else
       ifeq ($(OSARCH), solaris)


# END OF PATCH


Gerrit
-- 
=^..^=