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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/02/28 22:55:16

Modified files:
        config         : Makefile.in configure.in 
        src/daemon/driver: driverInteractive.ml 

Log message:
        patch #5757

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/Makefile.in?cvsroot=mldonkey&r1=1.176&r2=1.177
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.291&r2=1.292
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.126&r2=1.127

Patches:
Index: config/Makefile.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/Makefile.in,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -b -r1.176 -r1.177
--- config/Makefile.in  15 Feb 2007 14:26:08 -0000      1.176
+++ config/Makefile.in  28 Feb 2007 22:55:16 -0000      1.177
@@ -1276,7 +1276,7 @@
 MLPSOURCES +=  $($1_MLP:.mlcpp=.ml)
 
 build/$2.cmxa: $($1_OBJS) $($1_CMXS) 
-       $(OCAMLOPT) $(PLUGIN_FLAG) -a -o address@hidden  $($1_OBJS) 
$(LIBS_flags) $($3_LIBS_flags) $($1_CMXS) 
+       $(OCAMLOPT) -a -o address@hidden  $($1_OBJS) $(LIBS_flags) 
$($3_LIBS_flags) $($1_CMXS) 
  
 build/$2.cma: $($1_OBJS) $($1_CMOS) 
        $(OCAMLC) -a -o address@hidden  $($1_OBJS) $(LIBS_flags) 
$($3_LIBS_flags) $($1_CMOS) 
@@ -1382,7 +1382,7 @@
 TMPSOURCES += $($1_ML4:.ml4=.ml) $($1_MLT:.mlt=.ml) $($1_MLP:.mlcpp=.ml) 
$($1_MLL:.mll=.ml) $($1_MLY:.mly=.ml) $($1_MLY:.mly=.mli) $($1_ZOG:.zog=.ml) 
  
 $2: $($1_OBJS) $($1_CMXS) $($1_CMXAS)
-       $(OCAMLOPT) -linkall $(PLUGIN_FLAG) -o address@hidden \
+       $(OCAMLOPT) -linkall -o address@hidden \
        $($1_OBJS) $(LIBS_opt) $(LIBS_flags) \
        $($3_LIBS_opt) $($3_LIBS_flags) \
        $($5_LIBS_opt) $($5_LIBS_flags) \
@@ -1400,13 +1400,22 @@
        -I build $($1_CMAS) $($1_CMOS) 
  
 $2.static: $($1_OBJS) $($1_CMXS) $($1_CMXAS)
-       $(OCAMLOPT) -linkall $(PLUGIN_FLAG) -ccopt -static -o address@hidden \
+       $(OCAMLOPT) -linkall -ccopt -static -o address@hidden \
        $($1_OBJS) $(LIBS_opt) $(LIBS_flags) \
        $($3_LIBS_flags) $($3_STATIC_LIBS_opt) \
        $($5_LIBS_flags) $($5_STATIC_LIBS_opt) \
        $($6_LIBS_flags) $($6_STATIC_LIBS_opt) \
        $($7_LIBS_flags) $($7_STATIC_LIBS_opt) \
        -I build $($1_CMXAS) $($1_CMXS)
+
+$2.byte.static: $($1_OBJS) $($1_CMOS) $($1_CMAS)
+       $(OCAMLC) -linkall -ccopt -static -o address@hidden \
+       $($1_OBJS) $(LIBS_byte) $(LIBS_flags) \
+       $($3_LIBS_flags) $($3_STATIC_LIBS_opt) \
+       $($5_LIBS_flags) $($5_STATIC_LIBS_opt) \
+       $($6_LIBS_flags) $($6_STATIC_LIBS_opt) \
+       $($7_LIBS_flags) $($7_STATIC_LIBS_opt) \
+       -I build $($1_CMAS) $($1_CMOS) 
 ]])
 
 # $1 = source-code collection
@@ -1487,7 +1496,7 @@
 TMPSOURCES += $(TOP_ML4:.ml4=.ml) $(TOP_MLL:.mll=.ml) $(TOP_MLY:.mly=.ml) 
$(TOP_MLY:.mly=.mli) $(TOP_ZOG:.zog=.ml) 
 
 mldonkeytop: $(TOP_OBJS) $(TOP_CMOS) $(TOP_CMAS)
-       $(OCAMLMKTOP) -linkall $(PLUGIN_FLAG) -o $@  \
+       $(OCAMLMKTOP) -linkall -o $@  \
        $(TOP_OBJS) \
        $(LIBS_byte) $(LIBS_flags) $(_LIBS_byte) $(_LIBS_flags) \
        $(CRYPTOPP_LIBS_byte) $(CRYPTOPP_LIBS_flags) \
@@ -1669,9 +1678,22 @@
 $(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/ocamlopt: 
$(LOCAL)/ocamlopt-$(REQUIRED_OCAML)/Makefile
        cd $(LOCAL)/ocamlopt-$(REQUIRED_OCAML); $(MAKE)
 
-utils: svg_converter mld_hash make_torrent copysources get_range subconv
 utils.byte: mld_hash.byte make_torrent.byte copysources.byte get_range.byte 
subconv.byte
-utils.static: svg_converter mld_hash.static make_torrent.static 
copysources.static get_range.static subconv.static
+utils.opt: svg_converter mld_hash make_torrent copysources get_range subconv
+utils.opt.static: svg_converter mld_hash.static make_torrent.static 
copysources.static get_range.static subconv.static
+utils.byte.static: mld_hash.byte.static make_torrent.byte.static 
copysources.byte.static get_range.byte.static subconv.byte.static
+utils.static: 
+       if test "$(TARGET_TYPE)" = "byte"; then \
+               $(MAKE) utils.byte.static; \
+       else \
+               $(MAKE) utils.opt.static; \
+       fi
+utils: 
+       if test "$(TARGET_TYPE)" = "byte"; then \
+               $(MAKE) utils.byte; \
+       else \
+               $(MAKE) utils.opt; \
+       fi
 
 #######################################################################
 
@@ -1732,6 +1754,15 @@
        mv $(DISDIR).tar mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
        $(COMPRESS) mldonkey-$(CURRENT_VERSION).static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
 
+release.mlnet.byte.static: mlnet.byte.static
+       rm -rf mldonkey-*
+       cp -R distrib $(DISDIR)
+       cp mlnet.byte.static $(DISDIR)/mlnet
+       mv $(DISDIR) $(DISDIR)-$(CURRENT_VERSION)
+       tar cf $(DISDIR).tar $(DISDIR)-$(CURRENT_VERSION)
+       mv $(DISDIR).tar 
mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+       $(COMPRESS) mldonkey-$(CURRENT_VERSION).byte.static.$(MD4ARCH)-`uname 
-s`$(GLIBC_VERSION_ARCH).tar
+
 release.mlnet.distri: mlnet mlnet.static
        rm -rf mldonkey-*
        cp -R distrib $(DISDIR)
@@ -1892,15 +1923,15 @@
 .SUFFIXES: .mli .ml .cmx .cmo .o .c .cmi .mll .mly .zog .plugindep .xpm .ml 
.cc .ml_icons .ml4 .mlt .mlii .mlcpp .svg
 
 .mli.cmi :
-       $(OCAMLC) $(OFLAGS) $(INCLUDES) -c $<
+       $(OCAMLC) $(INCLUDES) -c $<
 
 .ml.mlii :
        rm -f $*.mli
-       $(OCAMLC) -i $(OFLAGS) $(INCLUDES) -c $< > $*.mlii
+       $(OCAMLC) -i $(INCLUDES) -c $< > $*.mlii
        mv $*.mlii $*.mli
 
 .ml.cmi :
-       $(OCAMLC) $(OFLAGS) $(INCLUDES) -c $<
+       $(OCAMLC) $(INCLUDES) -c $<
 
 .xpm.ml_icons :
        echo "let t = [|" > $@
@@ -1916,10 +1947,10 @@
        ./svg_converter.byte $@
 
 .ml.cmx :
-       $(OCAMLOPT) $(DEVFLAGSOPT) $(DEVFLAGS) $(PLUGIN_FLAG) $(OFLAGS) 
$(INCLUDES) -c $<
+       $(OCAMLOPT) $(DEVFLAGSOPT) $(DEVFLAGS) $(INCLUDES) -c $<
 
 .ml.cmo :
-       $(OCAMLC) $(DEVFLAGS) $(OFLAGS) $(INCLUDES) -c $<
+       $(OCAMLC) $(DEVFLAGS) $(INCLUDES) -c $<
 
 .mlcpp.ml:
        cpp -P $< $(FIX_BROKEN_CPP) > $@
@@ -1953,7 +1984,7 @@
        $(OCAMLC) -o $*.byte $(LIBS) $<
 
 .cmx.opt:
-       $(OCAMLOPT) $(PLUGIN_FLAG) -o $*.opt $(OPTLIBS) $<
+       $(OCAMLOPT) -o $*.opt $(OPTLIBS) $<
 
 
 .plugindep:

Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -b -r1.291 -r1.292
--- config/configure.in 11 Feb 2007 13:34:02 -0000      1.291
+++ config/configure.in 28 Feb 2007 22:55:16 -0000      1.292
@@ -1590,15 +1590,19 @@
   fi
 fi
 
+if test "$TARGET_TYPE" = "byte"; then
+  OCAML_TYPE="- byte code"
+  COMPILE_TARGET=".byte"
+fi
 echo -e "\nCompilers:"
-echo -e " - Ocaml version     $OCAMLVERSION"
+echo -e " - Ocaml version     $OCAMLVERSION $OCAML_TYPE"
 echo -e " - $CC version       $CC_VERSION"
 if test "x$CXX" != "x"; then
   echo -e " - $CXX version       $CXX_VERSION"
 fi
 echo -e "\nNow execute '$GNU_MAKE' to start compiling. Good luck!"
 
-echo -e "\nTo compile a static code execute:     $GNU_MAKE mlnet.static"
+echo -e "\nTo compile a static code execute:     $GNU_MAKE 
mlnet$COMPILE_TARGET.static"
 echo      "To produce a release tarball execute: $GNU_MAKE 
release.mlnet.static"
 echo      "To clean the build directory execute: $GNU_MAKE maintainerclean"
 if test "$DONKEY_SUI" = "yes"; then

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- src/daemon/driver/driverInteractive.ml      6 Feb 2007 22:26:58 -0000       
1.126
+++ src/daemon/driver/driverInteractive.ml      28 Feb 2007 22:55:16 -0000      
1.127
@@ -1859,6 +1859,9 @@
     (
       "Version:\t", 
       "MLNet Multi-Network p2p client version " ^ Autoconf.current_version 
+      ^ (match Filename.basename (Sys.executable_name) with
+         | "mlnet" | "mlnet.static" -> ""
+         | bin -> Printf.sprintf " (%s)" bin)
     );
   if Autoconf.scm_version <> "" then 
     tack list