[Mldonkey-commits] mldonkey config/Makefile.in config/configure.in...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/03/25 12:37:09

Modified files:
        config         : Makefile.in configure.in 
        distrib        : ChangeLog 
        src/utils/lib  : gettext.ml4 options.ml4 

Log message:
        patch #5817

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.179&r2=1.180
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.292&r2=1.293
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1212&r2=1.1213
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/gettext.ml4?cvsroot=mldonkey&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/options.ml4?cvsroot=mldonkey&r1=1.23&r2=1.24

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.179
retrieving revision 1.180
diff -u -b -r1.179 -r1.180
--- config/Makefile.in  11 Mar 2007 20:56:40 -0000      1.179
+++ config/Makefile.in  25 Mar 2007 12:37:09 -0000      1.180
@@ -1630,11 +1630,17 @@
 #ocamlpp.byte: tools/ocamlpp.ml
 #      $(OCAMLC) str.cma -o ocamlpp.byte tools/ocamlpp.ml
 
+ifeq ("$(GUI_CODE)", "OLDGUI")
+
+PA_ZOG: pa_zog.cma
+
+endif
+
 resfile.o:
        windres -o resfile.o config/mldonkey.rc
 
 depend:   $(RESFILE) \
-       pa_zog.cma $(LIB)/http_lexer.ml $(TMPSOURCES)
+       $(PA_ZOG) $(LIB)/http_lexer.ml $(TMPSOURCES)
        $(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I +labl$(GTK),,$(INCLUDES)) 
*.ml *.mli > .depend
        (for i in $(SUBDIRS); do \
                $(OCAMLDEP) $(OCAMLDEP_OPTIONS) $(patsubst -I 
+labl$(GTK),,$(INCLUDES)) $$i/*.ml $$i/*.mli  >> .depend; \

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -b -r1.292 -r1.293
--- config/configure.in 28 Feb 2007 22:55:16 -0000      1.292
+++ config/configure.in 25 Mar 2007 12:37:09 -0000      1.293
@@ -638,6 +638,12 @@
 OCAMLLIB=`$OCAMLC -where`
 REBUILD_OCAML=no
 case "$OCAMLVERSION" in
+    3.10*)
+      if test "$GUI" = "oldgui"; then
+        OLDGUI_NO_310=yes
+        GUI=no
+      fi
+      ;;
     "$REQUIRED_OCAML"*) ;;
     3.09.0*) ;;
     3.09.1*) ;;
@@ -1590,6 +1596,10 @@
   fi
 fi
 
+if test "$OLDGUI_NO_310" = "yes"; then
+  echo " - GUI support       GTK1 oldgui does not work with Ocaml 3.10, 
disabled"
+fi
+
 if test "$TARGET_TYPE" = "byte"; then
   OCAML_TYPE="- byte code"
   COMPILE_TARGET=".byte"

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -b -r1.1212 -r1.1213
--- distrib/ChangeLog   24 Mar 2007 16:49:36 -0000      1.1212
+++ distrib/ChangeLog   25 Mar 2007 12:37:09 -0000      1.1213
@@ -14,6 +14,16 @@
 ChangeLog
 =========
 
+2007/03/25
+5817: Code updates for Ocaml 3.10.0beta compatability
+- to use Ocaml 3.10 add ./configure option --enable-ocamlver=3.10
+- MLDonkey will accept the new Ocaml version without this option when
+  the final version of Ocaml 3.10 is released and proven to be working
+- GTK1 oldgui does currently not compile with Ocaml 3.10 code
+  - lablgtk1 & lablgtk2 compile with Ocaml 3.10, but some MLDonkey code
+    still needs fixing, GTK1 newgui and GTK2 gui compile with Ocaml 3.10
+- parts of the patch by pango
+
 2007/03/24
 5813: Options: Use original file rights in tar.gz backup,
       save backups with rights 600

Index: src/utils/lib/gettext.ml4
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/gettext.ml4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- src/utils/lib/gettext.ml4   19 Nov 2006 23:04:59 -0000      1.9
+++ src/utils/lib/gettext.ml4   25 Mar 2007 12:37:09 -0000      1.10
@@ -376,12 +376,12 @@
 let current_modname = ref ""
   
 let rec parse_file = (parser
-  |   [< 'String s0; 'Kwd "="; 'String s1 >] ->
+  |   [< 'String s0; 'Kwd "="; 'String s1; strm >] ->
 (*      lprintf "trans\n"; *)
-  translate !current_modname s0 s1; parse_file strm__
-  |   [< 'Kwd "module"; 'String modname >] ->
+  translate !current_modname s0 s1; parse_file strm
+  |   [< 'Kwd "module"; 'String modname; strm >] ->
   current_modname := modname;
-  parse_file  strm__
+  parse_file  strm
   |   [< >] -> (* lprintf "done\n" *) ())
   
 let set_strings_file filename =   
@@ -434,8 +434,8 @@
 
     
 let rec parse_file = (parser
-  |   [< 'Ident s0; 'Kwd "="; s1 = parse_next >] ->
-  translate1 s0 s1; parse_file strm__
+  |   [< 'Ident s0; 'Kwd "="; s1 = parse_next; strm >] ->
+  translate1 s0 s1; parse_file strm
   |   [< >] -> (* lprintf "done\n" *) ())
   
 and parse_next = parser
@@ -467,8 +467,8 @@
 in
     
 let rec parse_file = (parser
-  |   [< 'Ident s0; 'Kwd "="; s1 = parse_next >] ->
-  translate2 s0 s1; parse_file strm__
+  |   [< 'Ident s0; 'Kwd "="; s1 = parse_next; strm >] ->
+  translate2 s0 s1; parse_file strm
   |   [< >] -> (* lprintf "done\n" *) ())
   
 and parse_next = parser

Index: src/utils/lib/options.ml4
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/options.ml4,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- src/utils/lib/options.ml4   15 Jan 2007 18:26:27 -0000      1.23
+++ src/utils/lib/options.ml4   25 Mar 2007 12:37:09 -0000      1.24
@@ -230,10 +230,10 @@
 |   [< 'String s >] -> s
 
 and parse_list list = parser
-    [< 'Kwd ";" >] -> parse_list (list) strm__
-|   [< 'Kwd "," >] -> parse_list (list) strm__
-|   [< 'Kwd "." >] -> parse_list (list) strm__
-|   [< v = parse_option>] -> parse_list (v :: list) strm__
+    [< 'Kwd ";"; strm >] -> parse_list (list) strm
+|   [< 'Kwd ","; strm >] -> parse_list (list) strm
+|   [< 'Kwd "."; strm >] -> parse_list (list) strm
+|   [< v = parse_option; strm >] -> parse_list (v :: list) strm
 |   [< 'Kwd "]" >] -> List.rev list
 |   [< 'Kwd ")" >] -> List.rev list