Changeset 213 in MondoRescue for branches/2.05

Timestamp:

Dec 15, 2005, 1:41:46 AM (18 years ago)

Author:

bcornec

Message:

removed AuX_VER
removed g_version
use only VERSION from config.h
add $Rev$ to VERSION

Location:

branches/2.05/mondo

Files:

• configure.in (modified) (2 diffs, 1 prop)
• mondo/common/newt-specific.c (modified) (2 diffs)
• mondo/mondoarchive/main.c (modified) (1 diff)
• mondo/mondoarchive/mondo-cli.c (modified) (1 diff)
• mondo/mondorestore/mondo-restore.c (modified) (2 diffs)

branches/2.05/mondo/configure.in

@@ -7 +7 @@
 dnl $Id$
 dnl
-AC_INIT([Mondo Rescue],[2.05],[mondo-devel@lists.sourceforge.net])
+MONDO_VER=2.05
+MONDO_REV=`echo '$Rev$' | awk '{print $2}'`
+AC_INIT([Mondo Rescue],[${MONDO_VER}-r$MONDO_REV],[mondo-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([mondo/mondoarchive/main.c])
 AM_CONFIG_HEADER(config.h)
@@ -15 +17 @@
 AC_ARG_PROGRAM
 
-AM_INIT_AUTOMAKE([mondo], [2.05])
+AM_INIT_AUTOMAKE([mondo], [$MONDO_VER])
 AM_MAINTAINER_MODE
 

branches/2.05/mondo/mondo/common/newt-specific.c

@@ -128 +128 @@
     extern char *g_boot_mountpt;
     extern char *g_mondo_home;
-
-    extern char g_version[];
 
     extern void set_signals(int);
@@ -427 +425 @@
         system
             ("cat /var/log/mondo-archive.log | gzip -9 > /tmp/MA.log.gz 2> /dev/null");
-        if (!strstr(g_version, "cvs") && !strstr(g_version, "svn")) {
-            printf
-                ("Please try the snapshot (the version with 'cvs' and the date in its filename)");
-            printf
-                ("to see if that fixes the problem. Please don't bother the mailing list with");
-            printf
-                ("your problem UNTIL you've tried the snapshot. The snapshot contains bugfixes");
-            printf
-                ("which might help you. Go to http://www.mondorescue.org/download/download.html");
-            printf("For more information.\n");
-            log_msg(0,
-                    "Please DON'T contact the mailing list. Try the SNAPSHOTS.");
-        } else {
-            printf
+        printf
                 ("If you require technical support, please contact the mailing list.\n");
-            printf("See http://www.mondorescue.org for details.\n");
-            printf
+        printf("See http://www.mondorescue.org for details.\n");
+        printf
                 ("The list's members can help you, if you attach that file to your e-mail.\n");
-        }
         printf("Log file: %s\n", MONDO_LOGFILE);
-        //  printf("VERSION=%s\n", g_version);
         if (does_file_exist("/tmp/MA.log.gz")) {
             printf

branches/2.05/mondo/mondo/mondoarchive/main.c

@@ -118 +118 @@
 #include "mondo-cli-EXT.h"
 
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
-
-char g_version[] = VERSION;
-
-
 // for CVS
 //static char cvsid[] = "$Id$";

branches/2.05/mondo/mondo/mondoarchive/mondo-cli.c

@@ -166 +166 @@
 #include "mondo-cli-EXT.h"
 #include "../common/libmondo.h"
-
-
-
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
-
 
 //static char cvsid[] = "$Id$";

branches/2.05/mondo/mondo/mondorestore/mondo-restore.c

@@ -399 +399 @@
 #define g_ISO_restore_mode __mondorestore_g_ISO_restore_mode
 #endif
-
-#ifndef VERSION
-#define VERSION AUX_VER
-#endif
-
-char g_version[] = VERSION;
-
 
 //static char cvsid[] = "$Id$";
@@ -3194 +3187 @@
     char *tmp;
 
-#ifndef VERSION
-#define VERSION "1.7x_cvs"
-#endif
-
     struct mountlist_itself *mountlist;
     struct raidlist_itself *raidlist;