[Debburn-changes] r467 - in cdrkit/trunk: . genisoimage
genisoimage/diag icedax include readom wodim
Eduard Bloch
blade at alioth.debian.org
Sat Nov 25 12:40:08 CET 2006
Author: blade
Date: 2006-11-25 12:40:07 +0100 (Sat, 25 Nov 2006)
New Revision: 467
Modified:
cdrkit/trunk/VERSION
cdrkit/trunk/genisoimage/diag/dump.c
cdrkit/trunk/genisoimage/diag/isodebug.c
cdrkit/trunk/genisoimage/diag/isodump.c
cdrkit/trunk/genisoimage/diag/isoinfo.c
cdrkit/trunk/genisoimage/diag/isovfy.c
cdrkit/trunk/genisoimage/genisoimage.c
cdrkit/trunk/icedax/icedax.c
cdrkit/trunk/include/CMakeLists.txt
cdrkit/trunk/include/xconfig.h.in
cdrkit/trunk/readom/readom.c
cdrkit/trunk/wodim/wodim.c
Log:
Consistent version printing, configured via xconfig.h.in and its cmake code
Modified: cdrkit/trunk/VERSION
===================================================================
--- cdrkit/trunk/VERSION 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/VERSION 2006-11-25 11:40:07 UTC (rev 467)
@@ -1 +1 @@
-1.0
+1.1
Modified: cdrkit/trunk/genisoimage/diag/dump.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/dump.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/diag/dump.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -279,7 +279,7 @@
if (help)
usage(0);
if (prvers) {
- printf("devdump %s (%s)\n", "2.01.01a03", HOST_SYSTEM);
+ printf("devdump %s (%s)\n", CDRKIT_VERSION, HOST_SYSTEM);
exit(0);
}
cac = argc - 1;
Modified: cdrkit/trunk/genisoimage/diag/isodebug.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isodebug.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/diag/isodebug.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -226,7 +226,7 @@
if (help)
usage(0);
if (prvers) {
- printf("isodebug %s (%s)\n", "2.01.01a03", HOST_SYSTEM);
+ printf("isodebug %s (%s)\n", CDRKIT_VERSION, HOST_SYSTEM);
exit(0);
}
cac = argc - 1;
Modified: cdrkit/trunk/genisoimage/diag/isodump.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isodump.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/diag/isodump.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -554,7 +554,7 @@
if (help)
usage(0);
if (prvers) {
- printf("isodump %s (%s)\n", "2.01.01a03", HOST_SYSTEM);
+ printf("isodump %s (%s)\n", CDRKIT_VERSION, HOST_SYSTEM);
exit(0);
}
cac = argc - 1;
Modified: cdrkit/trunk/genisoimage/diag/isoinfo.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isoinfo.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/diag/isoinfo.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -862,7 +862,7 @@
if (help)
usage(0);
if (prvers) {
- printf("isoinfo %s (%s)\n", "2.01.01a03", HOST_SYSTEM);
+ printf("isoinfo %s (%s)\n", CDRKIT_VERSION, HOST_SYSTEM);
exit(0);
}
cac = argc - 1;
Modified: cdrkit/trunk/genisoimage/diag/isovfy.c
===================================================================
--- cdrkit/trunk/genisoimage/diag/isovfy.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/diag/isovfy.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -700,7 +700,7 @@
if (help)
usage(0);
if (prvers) {
- printf("isovfy %s (%s)\n", "2.01.01a03", HOST_SYSTEM);
+ printf("isovfy %s (%s)\n", CDRKIT_VERSION, HOST_SYSTEM);
exit(0);
}
cac = argc - 1;
Modified: cdrkit/trunk/genisoimage/genisoimage.c
===================================================================
--- cdrkit/trunk/genisoimage/genisoimage.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/genisoimage/genisoimage.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -86,7 +86,7 @@
struct directory *root = NULL;
int path_ind;
-char version_string[] = "genisoimage 2.01.01a05-unofficial-iconv";
+char version_string[] = "genisoimage " CDRKIT_VERSION;
char *outfile;
FILE *discimage;
@@ -1049,11 +1049,7 @@
fprintf(stderr, "Usage: %s [options] -o file directory ...\n", program_name);
fprintf(stderr, "\nUse %s -help\n", program_name);
fprintf(stderr, "to get a list of valid options.\n");
- fprintf(stderr,
- "\nNOTE: This version of genisoimage differs from the one published by Eric Youngdale\n"
- "and from the one included in cdrtools (by Joerg Schilling).\n"
- "It provides a different set of features and has different problems.\n"
- "Report errors to debburn-devel at lists.alioth.debian.org.\n");
+ fprintf(stderr, "\nReport problems to debburn-devel at lists.alioth.debian.org.\n");
exit(excode);
}
@@ -1149,10 +1145,7 @@
}
}
fprintf(stderr,
- "\nNOTE: This version of genisoimage differs from the one published by Eric Youngdale\n"
- "and from the one included in cdrtools (by Joerg Schilling).\n"
- "It provides a different set of features and has different problems.\n"
- "Report errors to debburn-devel at lists.alioth.debian.org.\n");
+ "\nReport problems to debburn-devel at lists.alioth.debian.org.\n");
exit(excode);
}
@@ -2162,12 +2155,6 @@
break;
case OPTION_PVERSION:
printf("%s (%s)\n", version_string, HOST_SYSTEM);
-#ifdef OPTION_SILO_BOOT
- printf("Warning: this is unofficial (modified) version of genisoimage that incorporates\n");
- printf(" support for a non Sparc compliant boot method called SILO.\n");
- printf(" The official method to create Sparc boot CDs is to use -sparc-boot\n");
- printf(" In case of problems first test with an official version of genisoimage.\n");
-#endif
exit(0);
break;
case OPTION_NOSPLIT_SL_COMPONENT:
Modified: cdrkit/trunk/icedax/icedax.c
===================================================================
--- cdrkit/trunk/icedax/icedax.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/icedax/icedax.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -2168,12 +2168,9 @@
/* No more file type arguments */;
moreargs = cav - argv;
if (version) {
- fputs ("cdda2wav version ", stderr);
- fputs (VERSION, stderr);
- fputs ("\n"
- "NOTE: modified version of the cdrkit suite, differs from the original\n", stderr);
- exit (NO_ERROR);
- }
+ fprintf(stderr, "icedax " CDRKIT_VERSION "\n");
+ exit(EXIT_SUCCESS);
+ }
if (help) {
usage();
}
Modified: cdrkit/trunk/include/CMakeLists.txt
===================================================================
--- cdrkit/trunk/include/CMakeLists.txt 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/include/CMakeLists.txt 2006-11-25 11:40:07 UTC (rev 467)
@@ -1,5 +1,9 @@
PROJECT (INCLUDES)
+FILE(READ "${CMAKE_SOURCE_DIR}/VERSION" CDRKIT_VERSION)
+STRING(REPLACE "\n" "" CDRKIT_VERSION "${CDRKIT_VERSION}")
+MESSAGE("Configuring Cdrkit, version ${CDRKIT_VERSION}")
+
# auto-generated header with sizeof magic
INCLUDE(CheckTypeSize)
CHECK_TYPE_SIZE(short SIZE_SHORT)
@@ -118,5 +122,6 @@
")
CHECK_C_SOURCE_COMPILES("${TESTSRC}" HAVE_INET_NTOA)
+
CONFIGURE_FILE( xconfig.h.in xconfig.h)
Modified: cdrkit/trunk/include/xconfig.h.in
===================================================================
--- cdrkit/trunk/include/xconfig.h.in 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/include/xconfig.h.in 2006-11-25 11:40:07 UTC (rev 467)
@@ -281,4 +281,4 @@
#define HAVE_DYN_ARRAYS 1 /* If the compiler allows dynamic sized arrays */
#define HOST_SYSTEM "@CMAKE_SYSTEM_NAME@"
-#cmakedefine CDRKIT_VERSION "@CDRKIT_VERSION at -$Rev$"
+#cmakedefine CDRKIT_VERSION "@CDRKIT_VERSION@ [$Rev$]"
Modified: cdrkit/trunk/readom/readom.c
===================================================================
--- cdrkit/trunk/readom/readom.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/readom/readom.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -225,7 +225,7 @@
static void
usage(int ret)
{
- fprintf(stderr, "Usage:\treadcd [options]\n");
+ fprintf(stderr, "Usage:\treadom [options]\n");
fprintf(stderr, "options:\n");
fprintf(stderr, "\t-version print version information and exit\n");
fprintf(stderr, "\tdev=target SCSI target to use\n");
@@ -314,12 +314,12 @@
}
if (help)
usage(0);
- if (pversion) {
- printf("readcd %s (%s) "
- "Copyright (C) 1987, 1995-2006 Joerg Schilling\n",
- cdr_version, HOST_SYSTEM);
- printf("(using modified version of libusal -- "
- "don't bother Joerg Schilling with problems)\n");
+ if (pversion) {
+ printf("readom " CDRKIT_VERSION " (" HOST_SYSTEM ")\n"
+ "Copyright (C) 1987, 1995-2006 Joerg Schilling\n"
+ "Copyright (C) 2006 Cdrkit maintainers\n"
+ "(modified version of <censored> -- "
+ "don't bother Joerg Schilling with problems)\n");
exit(0);
}
Modified: cdrkit/trunk/wodim/wodim.c
===================================================================
--- cdrkit/trunk/wodim/wodim.c 2006-11-25 11:12:38 UTC (rev 466)
+++ cdrkit/trunk/wodim/wodim.c 2006-11-25 11:40:07 UTC (rev 467)
@@ -81,8 +81,6 @@
#include <sys/capability.h> /* for rawio capability */
#endif
-#define cdr_version "1.0"
-
#if defined(_POSIX_PRIORITY_SCHEDULING) && _POSIX_PRIORITY_SCHEDULING -0 >= 0
#ifdef HAVE_SYS_PRIOCNTL_H /* The preferred SYSvR4 schduler */
#else
@@ -319,7 +317,7 @@
if (flags & F_VERSION) {
fprintf(stderr,
"Cdrecord-yelling-line-to-tell-frontends-to-use-it-like-version 2.01.01a03-dvd \n"
- "Wodim " cdr_version "\n"
+ "Wodim " CDRKIT_VERSION "\n"
"Copyright (C) 2006 Cdrkit suite contributors\n"
"Based on works from Joerg Schilling, Copyright (C) 1995-2006, J. Schilling\n"
);
More information about the Debburn-changes
mailing list