Changeset 1051 in MondoRescue

Timestamp:

Jan 11, 2007, 1:06:52 AM (18 years ago)

Author:

Bruno Cornec

Message:

Partial re-introduction of trunk changes for the next stable version (tools, contrib)
Preparation ofr addition of localisation patch to mondo
Should not compile in that state

Location:

branches/stable

Files:

• contrib/backup-kungfu/backup-kungfu (modified) (2 diffs)
• mondo/AUTHORS (modified) (1 diff)
• mondo/INSTALL (modified) (1 diff)
• mondo/bootstrap (modified) (2 diffs)
• mondo/configure.in (modified) (3 diffs)
• mondo/distributions/debian/README.Debian (added)
• mondo/distributions/rpm/mondo.spec (modified) (1 diff)
• tools/mdiff (added)
• tools/mval (added)
• tools/ptest.pl (added)
• tools/svn2build (modified) (3 diffs)

branches/stable/contrib/backup-kungfu/backup-kungfu

@@ -68 +68 @@
 function remove_garbage {
     echo -e "Removing the files left from previous mondoarchive run...\n"
-    rm -rf /root/images
+    rm -rf /var/cache/mondo
     rm -rf ${backup_dir}/mondo*
     rm -rf ${backup_dir}/tmp*
@@ -107 +107 @@
     echo -e "Creating the new backup directory and moving the files there...\n"
     mkdir -p ${backup_dir}/${comp_name}_${date}/images
-    cp /root/images/mindi/* ${backup_dir}/${comp_name}_${date}/images/
+    cp /var/cache/mindi/* ${backup_dir}/${comp_name}_${date}/images/
     
     # If you want just move the iso files without renaming them just uncomment the next line

branches/stable/mondo/AUTHORS

@@ -1 @@
-Hugo Rabson <hugorabson@msn.com>
+mondorescue is copyrighted under the GPL by the following authors:
+
+Hugo Rabson <hugo.rabson@mondorescue.org>
 Jesse Keating <hosting@j2solutions.net>
 Stan Benoit <troff@nakedsoul.org>
 Mikael Hultgren <mikael.hultgren@gmx.net>
+Bruno Cornec <bcornec@users.berlios.de>
+Andree Leidenfrost <andree@users.berlios.de>

branches/stable/mondo/INSTALL

@@ -13 +13 @@
 configure --with-maximum-noof-media=<big-number>. To make a statically
 linked mondorestore (not tested), configure --enable-static-mr.
-
-*** To compile XMondo, you must configure --with-x11. ***
-
-Yes, XMondo *does* exist :-) but seeing as many folks don't have Qt and
-KDE libraries, it's *NOT* compiled by default.
-
-
-
-
-
-
-
-
-
 
 [original entry]

branches/stable/mondo/bootstrap

@@ -1 +1 @@
 #!/bin/bash
+#
+# $Id$
 #
 # Built from scratch
@@ -28 +30 @@
 make maintainer-clean >/dev/null 2>&1
 libtoolize -f -c --automake
-aclocal
+cp /usr/bin/gettextize .
+perl -pi -e 's~read dummy < /dev/tty~~' gettextize
+./gettextize -c -f --no-changelog < /dev/null
+rm -f gettextize
+aclocal -I m4
 autoheader
 automake

branches/stable/mondo/configure.in

@@ -30 +30 @@
 AC_PROG_MAKE_SET
 
+AM_GNU_GETTEXT([external])
+ALL_LINGUAS="fr"
 
 dnl --with/--enable stuff
@@ -84 +86 @@
 case "$host_cpu" in
     i?86*)
-    #x86_64*)
         ARCH=i386
-        CPPFLAGS="$CPPFLAGS -D__IA32__"
+        CPPFLAGS="$CPPFLAGS -D__IA32__ -Wall"
+        ;;
+    x86_64*)
+        ARCH=x86-64
+        CPPFLAGS="$CPPFLAGS -D__X86_64__ -Wall"
         ;;
     ia64*)
         ARCH=ia64
-        CPPFLAGS="$CPPFLAGS -D__IA64__"
+        CPPFLAGS="$CPPFLAGS -D__IA64__ -Wall"
         ;;
     *)
-        echo "*** Sorry, only Intel Architectures (ia32, ia64) are supported at this time. Want to help?" 
+        echo "*** Sorry, only Intel Architectures (ia32, x86-64, ia64) are supported at this time." 
+        echo "If you Want to help send a mail to bcornec@users.berlios.de" 
         ;;
 esac
@@ -119 +125 @@
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
+AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr strspn getline asprintf trunc vasprintf])
 
-AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/restore-scripts/usr/Makefile src/restore-scripts/usr/bin/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])
+AC_OUTPUT([Makefile src/Makefile src/common/Makefile src/lib/Makefile src/mondoarchive/Makefile src/mondorestore/Makefile src/restore-scripts/Makefile src/restore-scripts/mondo/Makefile src/restore-scripts/usr/Makefile src/restore-scripts/usr/bin/Makefile src/post-nuke.sample/Makefile src/post-nuke.sample/usr/Makefile src/post-nuke.sample/usr/bin/Makefile])

branches/stable/mondo/distributions/rpm/mondo.spec

@@ -74 +74 @@
 %doc docs/en/mondorescue-howto.html docs/en/mondorescue-howto.pdf
 
+%{_datadir}/locale/*/LC_MESSAGES/mondo.mo
 %{_sbindir}/*
 %{_datadir}/%{name}

branches/stable/tools/svn2build

@@ -22 +22 @@
 TAG=`cat ${TOOLHOME}/../mondo/TAG`
 DEST=${TOPDIR}/${VER}-$TAG
+TEST="false"
+OPT=""
 mkdir -p $DEST
 
+if [ "$1" = "--test" ]; then
+    TEST="true"
+    OPT="-r BASE"
+    shift
+fi  
+
 if [ "$1" = "" ]; then
-        c="mondo-doc mindi mindi-busybox mondo"
+    c="mondo-doc mindi mindi-busybox mondo"
 else
     if [ "$1" = "all" ]; then
@@ -43 +51 @@
     dest="$DEST/$p-$v"
     rm -fr $dest
-    svn export ${TOOLHOME}/../$p $dest
+    svn $OPT export ${TOOLHOME}/../$p $dest
     echo "$REVISION" > $dest/REVISION
     echo "Generating SVN log file ..."
-    svn log -v ${TOOLHOME}/../$p > $dest/svn.log
+    svn $OPT log -v ${TOOLHOME}/../$p > $dest/svn.log
 
     for d in `cat ${TOOLHOME}/DISTROS`; do
@@ -148 +156 @@
     echo -n "Creating $p tar files (gzip... "
     tar cfphz ${DEST}/$p-$v.tar.gz $p-$v
-    echo -n " bzip2..."
-    tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
+    if [ $TEST = "false" ]; then
+        echo -n " bzip2..."
+        tar cfphj ${DEST}/$p-$v.tar.bz2 $p-$v
+    fi
     echo " )"
+    if [ $TEST = "true" ]; then
+        echo "Use source under $DEST/$p-$v"
+    fi
 done