[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...
From: |
mldonkey-commits |
Subject: |
[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ... |
Date: |
Sun, 24 Jun 2012 07:59:41 +0000 |
CVSROOT: /sources/mldonkey
Module name: mldonkey
Changes by: spiralvoice <spiralvoice> 12/06/24 07:59:41
Modified files:
config : configure.in
distrib : ChangeLog Install.txt
src/daemon/common: commonInteractive.ml
src/daemon/driver: driverInteractive.ml
src/gtk/gui : gui_keys.ml
src/gtk/newgui : gui_keys.ml
src/networks/donkey: donkeyReliability.ml donkeyThieves.ml
src/utils/cdk : filename2.ml gd.ml gdstubs.c
src/utils/lib : tiger.c
Log message:
patch #7795
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.352&r2=1.353
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1551&r2=1.1552
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/Install.txt?cvsroot=mldonkey&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.112&r2=1.113
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.143&r2=1.144
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/gui/gui_keys.ml?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/gtk/newgui/gui_keys.ml?cvsroot=mldonkey&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyReliability.ml?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyThieves.ml?cvsroot=mldonkey&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/filename2.ml?cvsroot=mldonkey&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/gd.ml?cvsroot=mldonkey&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/gdstubs.c?cvsroot=mldonkey&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/tiger.c?cvsroot=mldonkey&r1=1.12&r2=1.13
Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.352
retrieving revision 1.353
diff -u -b -r1.352 -r1.353
--- config/configure.in 24 Jun 2012 07:58:09 -0000 1.352
+++ config/configure.in 24 Jun 2012 07:59:40 -0000 1.353
@@ -274,7 +274,7 @@
fi
# **********
**********
-# ********** build MLDonkey version, Required Ocaml and LablGTK
versions **********
+# ********** build MLDonkey version, Required OCaml and LablGTK
versions **********
# **********
**********
MLDONKEY_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$SUB_VERSION
@@ -408,10 +408,10 @@
AS_HELP_STRING([--enable-batch], [reply YES to all queries in this script]),
[BATCH="$enableval"])
AC_ARG_ENABLE(force-ocaml,
- AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled Ocaml]),
+ AS_HELP_STRING([--enable-force-ocaml], [force usage of self-compiled OCaml]),
[FORCE_OCAML="$enableval"])
AC_ARG_ENABLE(ocamlver,
- AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific Ocaml
version (3.10.1|SVN), ]),
+ AS_HELP_STRING([--enable-ocamlver=VER], [force usage of specific OCaml
version (3.10.1|SVN), ]),
[REQUIRED_OCAML="$enableval"])
AC_ARG_ENABLE(mingw,
AS_HELP_STRING([--enable-mingw], [force compilation with MINGW on Cygwin]),
@@ -533,7 +533,7 @@
echo "----------------------------------------"
echo ""
echo "--------------------------------"
-echo " Checking Ocaml compiler."
+echo " Checking OCaml compiler."
echo "--------------------------------"
CONFIG_DIR=$SOURCE_DIR/config
@@ -576,18 +576,18 @@
if [ test "$SYSTEM" = "mingw" ]; then
echo "******** Objective-Caml $REQUIRED_OCAML is required
*********" 1>&2;
- echo "******** no valid Ocaml compiler found on your system
*********" 1>&2;
+ echo "******** no valid OCaml compiler found on your system
*********" 1>&2;
echo "******** on MinGW there is no possibility to let configure
*********" 1>&2;
- echo "******** build the Ocaml compiler with the included script
*********" 1>&2;
+ echo "******** build the OCaml compiler with the included script
*********" 1>&2;
echo "******** check http://mldonkey.sourceforge.net/Windows
*********" 1>&2;
- echo "******** for instuctions how to compile Ocaml under MinGW
*********" 1>&2;
+ echo "******** for instuctions how to compile OCaml under MinGW
*********" 1>&2;
exit 1
else
echo "******** Objective-Caml $REQUIRED_OCAML is required *********" 1>&2;
if [ test "$WGET" = "" ] && [ test "$REQUIRED_OCAML" != "SVN" ]; then
echo "******** wget is missing *********" 1>&2;
- echo "******** cannot download Ocaml *********" 1>&2;
+ echo "******** cannot download OCaml *********" 1>&2;
exit 1
fi
echo "******* Check http://caml.inria.fr/ ********" 1>&2;
@@ -615,7 +615,7 @@
$WGET
http://caml.inria.fr/pub/distrib/ocaml-3.10/ocaml-"$REQUIRED_OCAML".tar.gz
fi
if test ! -f ocaml-"$REQUIRED_OCAML".tar.gz; then
- echo "******** download Ocaml $REQUIRED_OCAML not successful,
try do download it manually *********" 1>&2;
+ echo "******** download OCaml $REQUIRED_OCAML not successful,
try do download it manually *********" 1>&2;
echo "******** from http://caml.inria.fr/pub/distrib/
*********" 1>&2;
echo "******** and copy the tar.gz into $PATCH_DIR
*********" 1>&2;
exit 1
@@ -655,7 +655,7 @@
rm -rf ocaml-"$REQUIRED_OCAML"
fi
cd $CONFIG_DIR
- echo Ocaml locally installed for mldonkey
+ echo OCaml locally installed for mldonkey
if test -f "$LOCAL_OCAML"/ocamlc.opt; then
OCAMLC=$LOCAL_OCAML/ocamlc.opt
@@ -665,7 +665,7 @@
OCAMLC=$LOCAL_OCAML/ocamlc
ac_cv_prog_OCAMLC=$LOCAL_OCAML/ocamlc
else
- echo "Ocaml installation failed"; exit 1
+ echo "OCaml installation failed"; exit 1
fi
fi
;;
@@ -726,7 +726,7 @@
CAMLP4LIB_OPT="dynlink.cmxa $CAMLP4LIB_OPT"
fi
-# force usage of supported Ocaml versions
+# force usage of supported OCaml versions
case "$OCAMLVERSION" in
3.10.1*|3.10.2*|3.1*) ;;
*)
@@ -755,7 +755,7 @@
fi
echo "-------------------------------------------"
-echo " Checking Ocaml $OCAMLVERSION finished."
+echo " Checking OCaml $OCAMLVERSION finished."
echo "-------------------------------------------"
@@ -1747,7 +1747,7 @@
fi
echo ""
printf "Compilers:"
-echo " - Ocaml version $OCAMLVERSION $OCAML_TYPE"
+echo " - OCaml version $OCAMLVERSION $OCAML_TYPE"
echo " - $CC version $CC_VERSION"
if test "x$CXX" != "x"; then
echo " - $CXX version $CXX_VERSION"
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1551
retrieving revision 1.1552
diff -u -b -r1.1551 -r1.1552
--- distrib/ChangeLog 24 Jun 2012 07:58:09 -0000 1.1551
+++ distrib/ChangeLog 24 Jun 2012 07:59:40 -0000 1.1552
@@ -15,6 +15,7 @@
=========
2012/06/24
+7795: spelling fix, official language name is "OCaml" (ygrek)
7796: configure: fix non-portable use of echo (ygrek)
2012/05/23
Index: distrib/Install.txt
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/Install.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- distrib/Install.txt 2 Mar 2008 14:23:48 -0000 1.17
+++ distrib/Install.txt 24 Jun 2012 07:59:40 -0000 1.18
@@ -57,7 +57,7 @@
The configure script will download ocaml and lablgtk, compile and install them
locally so that they can be used to compile mldonkey. Steps below can be
skipped
-now. Be patient. Ocaml and lablgtk tools take a while to compile and install.
+now. Be patient. OCaml and lablgtk tools take a while to compile and install.
Note: At least 70 M of free disk space is required on the partition where
mldonkey
is compiled.
@@ -100,7 +100,7 @@
To build GTK1 newgui: ./configure --enable-gui=newgui1
To build GTK1 oldgui: ./configure --enable-gui=oldgui
- - note: oldgui does not compile with Ocaml >= 3.10
+ - note: oldgui does not compile with OCaml >= 3.10
To build GTK2 GUI: ./configure --enable-gui[=newgui2]
lablgtk-1.2.7 and lablgtk-2.10.1 can both be installed at the same time.
Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -b -r1.112 -r1.113
--- src/daemon/common/commonInteractive.ml 13 Mar 2011 17:51:02 -0000
1.112
+++ src/daemon/common/commonInteractive.ml 24 Jun 2012 07:59:40 -0000
1.113
@@ -87,7 +87,7 @@
if not Autoconf.windows then
Charset.Locale.to_locale (Buffer.contents buf)
else
- Buffer.contents buf (* Windows uses patched Ocaml which always uses
Unicode chars *)
+ Buffer.contents buf (* Windows uses patched OCaml which always uses
Unicode chars *)
let last_sent_dir_warning = Hashtbl.create 10
Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- src/daemon/driver/driverInteractive.ml 1 Nov 2010 17:19:23 -0000
1.143
+++ src/daemon/driver/driverInteractive.ml 24 Jun 2012 07:59:40 -0000
1.144
@@ -1878,7 +1878,7 @@
);
tack list
(
- "Ocaml version:\t",
+ "OCaml version:\t",
Sys.ocaml_version ^
" - C compiler version: " ^ Autoconf.cc_version ^
(if Autoconf.cxx_version <> "" then
Index: src/gtk/gui/gui_keys.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/gui/gui_keys.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/gtk/gui/gui_keys.ml 22 Apr 2003 22:33:39 -0000 1.1
+++ src/gtk/gui/gui_keys.ml 24 Jun 2012 07:59:40 -0000 1.2
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* xlib for Ocaml *)
+(* xlib for OCaml *)
(* *)
(* Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt *)
(* *)
Index: src/gtk/newgui/gui_keys.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/gtk/newgui/gui_keys.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/gtk/newgui/gui_keys.ml 17 Nov 2003 21:12:51 -0000 1.1
+++ src/gtk/newgui/gui_keys.ml 24 Jun 2012 07:59:41 -0000 1.2
@@ -1,6 +1,6 @@
(***********************************************************************)
(* *)
-(* xlib for Ocaml *)
+(* xlib for OCaml *)
(* *)
(* Fabrice Le Fessant, projet Para/SOR, INRIA Rocquencourt *)
(* *)
Index: src/networks/donkey/donkeyReliability.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyReliability.ml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/networks/donkey/donkeyReliability.ml 8 Aug 2005 16:47:31 -0000
1.6
+++ src/networks/donkey/donkeyReliability.ml 24 Jun 2012 07:59:41 -0000
1.7
@@ -243,7 +243,7 @@
let to_string v _ =
let v = Marshal.to_string v [] in
-(* The header depends on Ocaml version. Remove it. *)
+(* The header depends on OCaml version. Remove it. *)
let v = String.sub v (Marshal.header_size)
(String.length v - Marshal.header_size) in
v
Index: src/networks/donkey/donkeyThieves.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyThieves.ml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/networks/donkey/donkeyThieves.ml 19 May 2006 23:43:54 -0000
1.8
+++ src/networks/donkey/donkeyThieves.ml 24 Jun 2012 07:59:41 -0000
1.9
@@ -130,7 +130,7 @@
let to_string v _ =
let v = Marshal.to_string v [] in
-(* The header depends on Ocaml version. Remove it. *)
+(* The header depends on OCaml version. Remove it. *)
let v = String.sub v (Marshal.header_size)
(String.length v - Marshal.header_size) in
v
Index: src/utils/cdk/filename2.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/filename2.ml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/utils/cdk/filename2.ml 7 Aug 2010 14:51:16 -0000 1.10
+++ src/utils/cdk/filename2.ml 24 Jun 2012 07:59:41 -0000 1.11
@@ -249,9 +249,9 @@
| _ ->
(try Sys.getenv "TEMP" with Not_found -> ".")
-(* this code is copied from Ocaml stdlib/filename.ml but
+(* this code is copied from OCaml stdlib/filename.ml but
extended to respect runtime changes to $MLDONKEY_TEMP,
- Ocaml uses variable $TMPDIR/$TEMP instead *)
+ OCaml uses variable $TMPDIR/$TEMP instead *)
external open_desc: string -> open_flag list -> int -> int = "caml_sys_open"
external close_desc: int -> unit = "caml_sys_close"
Index: src/utils/cdk/gd.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/gd.ml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/utils/cdk/gd.ml 6 Mar 2007 19:32:10 -0000 1.4
+++ src/utils/cdk/gd.ml 24 Jun 2012 07:59:41 -0000 1.5
@@ -1,5 +1,5 @@
(*
- * Ocaml-Gd. An interface to the Gd library for generating simple images
+ * OCaml-Gd. An interface to the Gd library for generating simple images
* Based on Shawn Wagner's OCamlGD 0.7.0. with some mods from GD4O
* Copyright (C) 2002 Shawn Wagner
* Copyright (C) 2003 Matthew C. Gushee
Index: src/utils/cdk/gdstubs.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/gdstubs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/utils/cdk/gdstubs.c 24 Feb 2009 18:34:31 -0000 1.6
+++ src/utils/cdk/gdstubs.c 24 Jun 2012 07:59:41 -0000 1.7
@@ -1,5 +1,5 @@
/*
- * Ocaml-Gd. An interface to the Gd library for generating simple images
+ * OCaml-Gd. An interface to the Gd library for generating simple images
* Based on Shawn Wagner's OCamlGD 0.7.0. with some mods from GD4O
* Copyright (C) 2002 Shawn Wagner
* Copyright (C) 2003 Matthew C. Gushee
Index: src/utils/lib/tiger.c
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/tiger.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/utils/lib/tiger.c 24 Feb 2009 18:34:31 -0000 1.12
+++ src/utils/lib/tiger.c 24 Jun 2012 07:59:41 -0000 1.13
@@ -811,7 +811,7 @@
/**************************************************************************
- Ocaml stubs (copied from md4_c.c)
+ OCaml stubs (copied from md4_c.c)
***************************************************************************/
- [Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...,
mldonkey-commits <=