[Mldonkey-commits] mldonkey config/Makefile.in distrib/ChangeLog s...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/11/01 17:06:18

Modified files:
        config         : Makefile.in 
        distrib        : ChangeLog 
        src/networks/donkey: donkeyOvernet.ml 

Log message:
        patch #7364

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.194&r2=1.195
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1494&r2=1.1495
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.82&r2=1.83

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- config/Makefile.in  19 Oct 2010 17:30:58 -0000      1.194
+++ config/Makefile.in  1 Nov 2010 17:06:15 -0000       1.195
@@ -330,6 +330,7 @@
   $(SRC_DONKEY)/donkeyOneFile.ml \
   \
   $(SRC_DONKEY)/donkeyOvernetImport.ml \
+  $(SRC_DONKEY)/donkeyNodesDat.ml \
   $(SRC_DONKEY)/donkeyOvernet.ml \
   $(SRC_DONKEY)/donkeyProtoKademlia.ml \
   $(SRC_DONKEY)/donkeyClient.ml \
@@ -436,11 +437,7 @@
 $(BITSTRING)/pa_bitstring.cmo: $(BITSTRING)/pa_bitstring.mlt 
$(BITSTRING)/bitstring_persistent.cmo build/bitstring.cma
        $(OCAMLC) -I $(BITSTRING) -I +camlp4 camlp4lib.cma -pp '$(CAMLP4OF) 
-impl' -c $^
 
-$(SRC_BITTORRENT)/bTUdpTracker.ml: $(SRC_BITTORRENT)/bTUdpTracker.mlp 
$(BITSTRING)/pa_bitstring.cmo
-       $(CAMLP4OF) build/bitstring.cma $(BITSTRING)/bitstring_persistent.cmo 
$(BITSTRING)/pa_bitstring.cmo -impl $< -o $@
-
 BITTORRENT_SRCS= \
-  $(BITSTRING_SRCS) \
   $(SRC_BITTORRENT)/bencode.ml \
   $(SRC_BITTORRENT)/bTRate.ml \
   $(SRC_BITTORRENT)/bTTypes.ml \
@@ -531,7 +528,7 @@
 
 MAKE_TORRENT_SRCS = \
   $(MAGIC_SRCS) $(CDK_SRCS) $(LIB_SRCS) $(NET_SRCS) $(MP3TAG_SRCS) \
-  $(COMMON_SRCS) $(COMMON_CLIENT_SRCS) $(BITTORRENT_SRCS) \
+  $(COMMON_SRCS) $(COMMON_CLIENT_SRCS) $(BITSTRING_SRCS) $(BITTORRENT_SRCS) \
   tools/make_torrent.ml
 
 GET_RANGE_SRCS = \
@@ -569,19 +566,30 @@
 ICONS_CMXA=icons.cmxa
 
 CDK_CMXA=cdk.cmxa
-MLNET_CMXA=$(CDK_CMXA) magic.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa
-MLNET_SRCS= $(MAIN_SRCS)
+BITSTRING_CMXA=
+BITSTRING_CMA=
+MLNET_SRCS=
+ifeq ("$(DONKEY)", "yes")
+BITSTRING_CMXA=bitstring.cmxa
+BITSTRING_CMA=bitstring.cma
+endif
+ifeq ("$(BITTORRENT)", "yes")
+BITSTRING_CMXA=bitstring.cmxa
+BITSTRING_CMA=bitstring.cma
+endif
+MLNET_SRCS+= $(MAIN_SRCS)
+MLNET_CMXA=$(CDK_CMXA) $(BITSTRING_CMXA) magic.cmxa common.cmxa client.cmxa 
core.cmxa driver.cmxa
 
 TESTS_CMXA=$(CDK_CMXA) magic.cmxa common.cmxa client.cmxa core.cmxa
 TESTS_SRCS=tools/tests.ml
 
 ifeq ("$(GUI)", "newgui2")
 mlnet+gui_CMXA= \
-  magic.cmxa cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa \
+  $(BITSTRING_CMXA) magic.cmxa cdk.cmxa common.cmxa client.cmxa core.cmxa 
driver.cmxa \
   icons.cmxa guibase.cmxa gui.cmxa
 else
 mlnet+gui_CMXA= \
-  magic.cmxa cdk.cmxa common.cmxa client.cmxa core.cmxa driver.cmxa \
+  $(BITSTRING_CMXA) magic.cmxa cdk.cmxa common.cmxa client.cmxa core.cmxa 
driver.cmxa \
   gmisc.cmxa icons.cmxa guibase.cmxa gui.cmxa
 endif
 
@@ -1112,7 +1120,7 @@
 runtop: top
        ./mldonkeytop $(INCLUDES)
 
-TOP_CMXA+=cdk.cmxa magic.cmxa common.cmxa client.cmxa core.cmxa
+TOP_CMXA+=$(BITSTRING_CMA) cdk.cmxa magic.cmxa common.cmxa client.cmxa 
core.cmxa
 TOP_SRCS= 
 
 define([[EXPAND_LIB]],[[
@@ -1154,24 +1162,31 @@
 
 endif
 
-$1_CMXA+= cdk.cmxa magic.cmxa common.cmxa client.cmxa $1.cmxa driver.cmxa
-
 ifeq ("$2", "DONKEY")
-$1_SRCS+= $(CRYPTOPP_SRCS) $(MAIN_SRCS)
+$1_SRCS+= $(CRYPTOPP_SRCS)
+$1_CMXA+= $(BITSTRING_CMXA)
+$1+gui_CMXA+= $(BITSTRING_CMXA)
 else
-$1_SRCS= $(MAIN_SRCS)
+ifeq ("$2", "BITTORRENT")
+$1_CMXA+= $(BITSTRING_CMXA)
+$1+gui_CMXA+= $(BITSTRING_CMXA)
 endif
+endif
+
+$1_CMXA+= cdk.cmxa magic.cmxa common.cmxa client.cmxa $1.cmxa driver.cmxa
+
+$1_SRCS+= $(MAIN_SRCS)
 
 EXPAND_LIB($2,$1)
 
 ifeq ("$(GUI)", "newgui2")
-$1+gui_CMXA=cdk.cmxa \
-   common.cmxa client.cmxa $1.cmxa driver.cmxa \
-   gmisc.cmxa icons.cmxa guibase.cmxa gui.cmxa
-else
-$1+gui_CMXA=cdk.cmxa \
-   common.cmxa client.cmxa $1.cmxa driver.cmxa \
+$1+gui_CMXA+=cdk.cmxa \
+   magic.cmxa common.cmxa client.cmxa $1.cmxa driver.cmxa \
    icons.cmxa guibase.cmxa gui.cmxa
+else
+$1+gui_CMXA+=cdk.cmxa \
+   magic.cmxa common.cmxa client.cmxa $1.cmxa driver.cmxa \
+   gmisc.cmxa icons.cmxa guibase.cmxa gui.cmxa
 endif
 
 $1+gui_SRCS= $(MAIN_SRCS)
@@ -1295,8 +1310,8 @@
 # $7 = if set link libmagic code (only for p2p core, not for GUIs, tools etc.)
 # $8 = if set link libbitstring code (only for Bittorrent p2p core)
 
-EXPAND(mldonkey,mldonkey,NO,mldonkey,GD,CRYPTOPP,MAGIC)
-EXPAND(mldonkey+gui,mldonkey+gui,GTK,mldonkey+gui,GD,CRYPTOPP,MAGIC)
+EXPAND(mldonkey,mldonkey,NO,mldonkey,GD,CRYPTOPP,MAGIC,BITSTRING)
+EXPAND(mldonkey+gui,mldonkey+gui,GTK,mldonkey+gui,GD,CRYPTOPP,MAGIC,BITSTRING)
 EXPAND(MLPROGRESS, mlprogress,GTK, MLPROGRESS)
 EXPAND(MLDONKEYGUI,mlgui,GTK,MLDONKEYGUI)
 
@@ -1426,7 +1441,10 @@
        rm -f build/*.a build/*.cma build/*.cmxa
        rm -f *_plugin
        rm -f mldonkey mlgui mlnet.exe mlgui.exe mldonkeytop mldonkeytop.exe
-       rm -f mlbt mlbt.exe mlfiletp mlfiletp.exe
+       rm -f mlbt mlbt+gui mlbt.exe
+       rm -f mlfiletp mlfiletp+gui mlfiletp.exe
+       rm -f mldc mldc+gui mldc.exe
+       rm -f mlfasttrack mlfasttrack+gui mlfasttrack.exe
        rm -f svg_converter svg_converter.byte mld_hash make_torrent 
copysources get_range subconv testrss
        rm -f svg_converter.exe mld_hash.exe make_torrent.exe copysources.exe 
get_range.exe subconv.exe testrss.exe
        (for i in $(SUBDIRS); do \
@@ -1454,6 +1472,7 @@
        rm -f src/daemon/driver/driverGraphics.ml
        rm -f src/networks/bittorrent/bTUdpTracker.ml
        rm -f src/networks/donkey/donkeySui.ml
+       rm -f src/networks/donkey/donkeyNodesDat.ml
        rm -f src/utils/bitstring/bitstring.ml
        rm -f src/utils/bitstring/bitstring_persistent.ml
        rm -f src/utils/lib/autoconf.ml
@@ -1796,6 +1815,9 @@
 .mlcpp.ml:
        @cpp -P $< $(FIX_BROKEN_CPP) > $@
 
+%.ml: %.mlp $(BITSTRING)/pa_bitstring.cmo
+       $(CAMLP4OF) build/bitstring.cma $(BITSTRING)/bitstring_persistent.cmo 
$(BITSTRING)/pa_bitstring.cmo -impl $< -o $@
+
 .mll.ml :
        @$(OCAMLLEX) -q $<
 

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1494
retrieving revision 1.1495
diff -u -b -r1.1494 -r1.1495
--- distrib/ChangeLog   28 Oct 2010 19:44:58 -0000      1.1494
+++ distrib/ChangeLog   1 Nov 2010 17:06:16 -0000       1.1495
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2010/11/01
+7364: KAD: parse new nodes.dat formats (ygrek)
+
 2010/10/28
 7358: Update mlnet_strings.ru_RU.UTF-8 (balamutick)
 

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- src/networks/donkey/donkeyOvernet.ml        3 Feb 2008 22:56:43 -0000       
1.82
+++ src/networks/donkey/donkeyOvernet.ml        1 Nov 2010 17:06:16 -0000       
1.83
@@ -2087,6 +2087,11 @@
 
 let _ =
   CommonWeb.add_web_kind web_info web_info_descr (fun url filename ->
+    try
+      DonkeyNodesDat.parse filename bootstrap
+    with
+      exn ->
+      lprintf_nl "Parsing nodes.dat as binary failed : %s : will try as text" 
(Printexc2.to_string exn);
       let s = File.to_string filename in
       let s = String2.replace s '"' "" in
       let lines = String2.split_simplify s '\n' in