[gs-cvs] rev 7964 - in branches/gs-esp-gpl-merger: cups src

till at ghostscript.com till at ghostscript.com
Sun May 13 16:13:47 PDT 2007 

Author: till
Date: 2007-05-13 16:13:47 -0700 (Sun, 13 May 2007)
New Revision: 7964

Added:
   branches/gs-esp-gpl-merger/src/version.mak
Removed:
   branches/gs-esp-gpl-merger/src/version.mak.in
Modified:
   branches/gs-esp-gpl-merger/cups/pstopxl.in
   branches/gs-esp-gpl-merger/cups/pstoraster.in
   branches/gs-esp-gpl-merger/src/Makefile.in
   branches/gs-esp-gpl-merger/src/configure.ac
Log:
Reverted from src/version.mak.in to src/version.mak, as the change did not
build under Windows. Let the CUPS scripts run "gs --version" to log the
version number before running gs for processing the job.


Modified: branches/gs-esp-gpl-merger/cups/pstopxl.in
===================================================================
--- branches/gs-esp-gpl-merger/cups/pstopxl.in	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/cups/pstopxl.in	2007-05-13 23:13:47 UTC (rev 7964)
@@ -56,7 +56,7 @@
 	ifile="$6"
 fi
 
-echo INFO: Starting GPL Ghostscript @GS_VERSION_MAJOR at .@GS_VERSION_MINOR0 at ... 1>&2
+echo INFO: Starting GPL Ghostscript `$bindir/@GS@ --version`... 1>&2
 echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile" 1>&2
 
 # Now run Ghostscript...

Modified: branches/gs-esp-gpl-merger/cups/pstoraster.in
===================================================================
--- branches/gs-esp-gpl-merger/cups/pstoraster.in	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/cups/pstoraster.in	2007-05-13 23:13:47 UTC (rev 7964)
@@ -51,7 +51,7 @@
 	ifile="$6"
 fi
 
-echo INFO: Starting GPL Ghostscript @GS_VERSION_MAJOR at .@GS_VERSION_MINOR0 at ... 1>&2
+echo INFO: Starting GPL Ghostscript `$bindir/@GS@ --version`... 1>&2
 echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile" 1>&2
 
 # Now run Ghostscript...

Modified: branches/gs-esp-gpl-merger/src/Makefile.in
===================================================================
--- branches/gs-esp-gpl-merger/src/Makefile.in	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/src/Makefile.in	2007-05-13 23:13:47 UTC (rev 7964)
@@ -39,21 +39,6 @@
 GLD=$(GLGENDIR)/
 PSD=$(PSGENDIR)/
 
-#### The following comes from the version.mak file, but we substitute
-#### the values from the configure script...
-# Major and minor version numbers.
-# MINOR0 is different from MINOR only if MINOR is a single digit.
-GS_VERSION_MAJOR=@GS_VERSION_MAJOR@
-GS_VERSION_MINOR=@GS_VERSION_MINOR@
-GS_VERSION_PATCH=@GS_VERSION_PATCH@
-GS_VERSION_MINOR0=@GS_VERSION_MINOR0@
-# Revision date: year x 10000 + month x 100 + day.
-GS_REVISIONDATE=@GS_REVISIONDATE@
-# Derived values
-GS_VERSION=@GS_VERSION@
-GS_DOT_VERSION=$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR0)
-GS_REVISION=$(GS_VERSION)
-
 # ------ Generic options ------ #
 
 # Define the installation commands and target directories for

Modified: branches/gs-esp-gpl-merger/src/configure.ac
===================================================================
--- branches/gs-esp-gpl-merger/src/configure.ac	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/src/configure.ac	2007-05-13 23:13:47 UTC (rev 7964)
@@ -22,24 +22,6 @@
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/gs.c)
 
-GS_VERSION_MAJOR=8
-GS_VERSION_MINOR=57
-GS_REVISIONDATE=20070426
-
-GS_VERSION=`expr $GS_VERSION_MAJOR \* 100 + $GS_VERSION_MINOR`
-
-if test $GS_VERSION_MINOR -lt 10; then
-	GS_VERSION_MINOR0=0$GS_VERSION_MINOR
-else
-	GS_VERSION_MINOR0=$GS_VERSION_MINOR
-fi
-
-AC_SUBST(GS_REVISIONDATE, $GS_REVISIONDATE)
-AC_SUBST(GS_VERSION_MAJOR, $GS_VERSION_MAJOR)
-AC_SUBST(GS_VERSION_MINOR, $GS_VERSION_MINOR)
-AC_SUBST(GS_VERSION_MINOR0, $GS_VERSION_MINOR0)
-AC_SUBST(GS_VERSION, $GS_VERSION)
-
 dnl Inherit compiler flags from the environment...
 CFLAGS="${CFLAGS:=}"
 CPPFLAGS="${CPPFLAGS:=}"
@@ -889,7 +871,6 @@
 
 AC_SUBST(OPT_CFLAGS)
 AC_SUBST(GCFLAGS)
-AC_OUTPUT(Makefile src/version.mak
-	  cups/pstopxl cups/pstoraster)
+AC_OUTPUT(Makefile cups/pstopxl cups/pstoraster)
 
 chmod +x cups/pstopxl cups/pstoraster

Added: branches/gs-esp-gpl-merger/src/version.mak
===================================================================
--- branches/gs-esp-gpl-merger/src/version.mak	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/src/version.mak	2007-05-13 23:13:47 UTC (rev 7964)
@@ -0,0 +1,26 @@
+#  Copyright (C) 2001-2007 artofcode LLC.
+#  All Rights Reserved.
+#
+#  This software is provided AS-IS with no warranty, either express or
+#  implied.
+#
+#  This software is distributed under license and may not be copied, modified
+#  or distributed except as expressly authorized under the terms of that
+#  license.  Refer to licensing information at http://www.artifex.com/
+#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
+#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
+#
+# $Id: version.mak 7956 2007-05-11 22:29:09Z giles $
+# Makefile fragment containing the current revision identification.
+
+# Major and minor version numbers.
+# MINOR0 is different from MINOR only if MINOR is a single digit.
+GS_VERSION_MAJOR=8
+GS_VERSION_MINOR=60
+GS_VERSION_MINOR0=60
+# Revision date: year x 10000 + month x 100 + day.
+GS_REVISIONDATE=20070512
+# Derived values
+GS_VERSION=$(GS_VERSION_MAJOR)$(GS_VERSION_MINOR0)
+GS_DOT_VERSION=$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR0)
+GS_REVISION=$(GS_VERSION)

Deleted: branches/gs-esp-gpl-merger/src/version.mak.in
===================================================================
--- branches/gs-esp-gpl-merger/src/version.mak.in	2007-05-13 16:17:02 UTC (rev 7963)
+++ branches/gs-esp-gpl-merger/src/version.mak.in	2007-05-13 23:13:47 UTC (rev 7964)
@@ -1,26 +0,0 @@
-#  Copyright (C) 2001-2006 artofcode LLC.
-#  All Rights Reserved.
-#
-#  This software is provided AS-IS with no warranty, either express or
-#  implied.
-#
-#  This software is distributed under license and may not be copied, modified
-#  or distributed except as expressly authorized under the terms of that
-#  license.  Refer to licensing information at http://www.artifex.com/
-#  or contact Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134,
-#  San Rafael, CA  94903, U.S.A., +1(415)492-9861, for further information.
-#
-# $Id$
-# Makefile fragment containing the current revision identification.
-
-# Major and minor version numbers.
-# MINOR0 is different from MINOR only if MINOR is a single digit.
-GS_VERSION_MAJOR=@GS_VERSION_MAJOR@
-GS_VERSION_MINOR=@GS_VERSION_MINOR@
-GS_VERSION_MINOR0=@GS_VERSION_MINOR0@
-# Revision date: year x 10000 + month x 100 + day.
-GS_REVISIONDATE=@GS_REVISIONDATE@
-# Derived values
-GS_VERSION=$(GS_VERSION_MAJOR)$(GS_VERSION_MINOR0)
-GS_DOT_VERSION=$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR0)
-GS_REVISION=$(GS_VERSION)

More information about the gs-cvs mailing list