Changeset 23790

Timestamp:

Apr 9, 2009, 6:06:36 PM (17 years ago)

Author:

Paul Price

Message:

Fixed version information in builds: determined separately (and singly!) for each component

Location:

trunk

Files:

• ppArith/configure.ac (modified) (1 diff)
• ppArith/src/Makefile.am (modified) (1 diff)
• ppImage/configure.ac (modified) (1 diff)
• ppImage/src/Makefile.am (modified) (1 diff)
• ppMerge/configure.ac (modified) (1 diff)
• ppMerge/src/Makefile.am (modified) (1 diff)
• ppSim/configure.ac (modified) (1 diff)
• ppSim/src/Makefile.am (modified) (1 diff)
• ppStack/configure.ac (modified) (1 diff)
• ppStack/src/Makefile.am (modified) (1 diff)
• ppStats/configure.ac (modified) (1 diff)
• ppStats/src/Makefile.am (modified) (1 diff)
• ppSub/configure.ac (modified) (1 diff)
• ppSub/src/Makefile.am (modified) (1 diff)
• psastro/configure.ac (modified) (1 diff)
• psastro/src/Makefile.am (modified) (1 diff)
• psconfig/psbuild (modified) (5 diffs)
• psphot/configure.ac (modified) (1 diff)
• psphot/src/Makefile.am (modified) (1 diff)
• pswarp/configure.ac (modified) (1 diff)
• pswarp/src/Makefile.am (modified) (1 diff)

trunk/ppArith/configure.ac

@@ -26 +26 @@
 CFLAGS="${CFLAGS} -Wall -Werror"
 
+IPP_VERSION(PPARITH)
+AC_SUBST(PPARITH_VERSION,[$PPARITH_VERSION])
+AC_SUBST(PPARITH_BRANCH,[$PPARITH_BRANCH])
+AC_SUBST(PPARITH_SOURCE,[$PPARITH_SOURCE])
+
 AC_SUBST([PPARITH_CFLAGS])
 AC_SUBST([PPARITH_LIBS])

trunk/ppArith/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppArith
 
-# PPARITH_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPARITH_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPARITH_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppArithVersion.c, since it gets the version information
-# ppArithVersion.c: FORCE
-#       touch ppArith.c
-# FORCE: ;
+# Force recompilation of ppArithVersion.c, since it gets the version information
+ppArithVersion.c: FORCE
+        touch ppArith.c
+FORCE: ;
 
-ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(SVN_VERSION) -DPPARITH_BRANCH=$(SVN_BRANCH) -DPPARITH_SOURCE=$(SVN_SOURCE)
+ppArith_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPARITH_CFLAGS) -DPPARITH_VERSION=$(PPARITH_VERSION) -DPPARITH_BRANCH=$(PPARITH_BRANCH) -DPPARITH_SOURCE=$(PPARITH_SOURCE)
 ppArith_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPARITH_LIBS)
 

trunk/ppImage/configure.ac

@@ -26 +26 @@
 CFLAGS="${CFLAGS=} -Wall -Werror"
 
+IPP_VERSION(PPIMAGE)
+AC_SUBST(PPIMAGE_VERSION,[$PPIMAGE_VERSION])
+AC_SUBST(PPIMAGE_BRANCH,[$PPIMAGE_BRANCH])
+AC_SUBST(PPIMAGE_SOURCE,[$PPIMAGE_SOURCE])
+
 AC_SUBST([PPIMAGE_CFLAGS])
 AC_SUBST([PPIMAGE_LIBS])

trunk/ppImage/src/Makefile.am

@@ -4 +4 @@
         ppImage.h 
 
-#PPIMAGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-#PPIMAGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-#PPIMAGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
+# Force recompilation of ppImageVersion.c, since it gets the version information
+ppImageVersion.c: FORCE
+        touch ppImageVersion.c
+FORCE: ;
 
-# Force recompilation of ppImageVersion.c, since it gets the version information
-# ppImageVersion.c: FORCE
-#       touch ppImageVersion.c
-# FORCE: ;
-
-ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPIMAGE_VERSION=$(SVN_VERSION) -DPPIMAGE_BRANCH=$(SVN_BRANCH) -DPPIMAGE_SOURCE=$(SVN_SOURCE)
+ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPIMAGE_VERSION=$(PPIMAGE_VERSION) -DPPIMAGE_BRANCH=$(PPIMAGE_BRANCH) -DPPIMAGE_SOURCE=$(PPIMAGE_SOURCE)
 ppImage_LDFLAGS = $(PPIMAGE_LIBS) $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 ppImage_SOURCES = \

trunk/ppMerge/configure.ac

@@ -21 +21 @@
 PKG_CHECK_MODULES([PPSTATS], [ppStats >= 1.0.0]) 
 
+IPP_VERSION(PPMERGE)
+AC_SUBST(PPMERGE_VERSION,[$PPMERGE_VERSION])
+AC_SUBST(PPMERGE_BRANCH,[$PPMERGE_BRANCH])
+AC_SUBST(PPMERGE_SOURCE,[$PPMERGE_SOURCE])
+
 IPP_STDOPTS
 CFLAGS="${CFLAGS=} -Wall -Werror"

trunk/ppMerge/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppMerge
 
-# PPMERGE_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPMERGE_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPMERGE_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppMergeVersion.c, since it gets the version information
-# ppMergeVersion.c: FORCE
-#       touch ppMergeVersion.c
-# FORCE: ;
+# Force recompilation of ppMergeVersion.c, since it gets the version information
+ppMergeVersion.c: FORCE
+        touch ppMergeVersion.c
+FORCE: ;
 
-ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=$(SVN_VERSION) -DPPMERGE_BRANCH=$(SVN_BRANCH) -DPPMERGE_SOURCE=$(SVN_SOURCE)
+ppMerge_CFLAGS = $(PPMERGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPMERGE_VERSION=$(PPMERGE_VERSION) -DPPMERGE_BRANCH=$(PPMERGE_BRANCH) -DPPMERGE_SOURCE=$(PPMERGE_SOURCE)
 ppMerge_LDFLAGS = $(PPMERGE_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

trunk/ppSim/configure.ac

@@ -22 +22 @@
 PKG_CHECK_MODULES([PSASTRO],  [psastro >= 0.9.0])
 
+IPP_VERSION(PPSIM)
+AC_SUBST(PPSIM_VERSION,[$PPSIM_VERSION])
+AC_SUBST(PPSIM_BRANCH,[$PPSIM_BRANCH])
+AC_SUBST(PPSIM_SOURCE,[$PPSIM_SOURCE])
+
 IPP_STDOPTS
 CFLAGS="${CFLAGS=} -Wall -Werror"

trunk/ppSim/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSim ppSimSequence
 
-# PPSIM_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSIM_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSIM_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSimVersion.c, since it gets the version information
-# ppSimVersion.c: FORCE
-#       touch ppSimVersion.c
-# FORCE: ;
+# Force recompilation of ppSimVersion.c, since it gets the version information
+ppSimVersion.c: FORCE
+        touch ppSimVersion.c
+FORCE: ;
 
-ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(SVN_VERSION) -DPPSIM_BRANCH=$(SVN_BRANCH) -DPPSIM_SOURCE=$(SVN_SOURCE)
+ppSim_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS) -DPPSIM_VERSION=$(PPSIM_VERSION) -DPPSIM_BRANCH=$(PPSIM_BRANCH) -DPPSIM_SOURCE=$(PPSIM_SOURCE)
 ppSim_LDFLAGS = $(PSLIB_LIBS) $(PSMODULE_LIBS) $(PSPHOT_LIBS) $(PSASTRO_LIBS)
 ppSim_SOURCES = \

trunk/ppStack/configure.ac

@@ -25 +25 @@
 CFLAGS="${CFLAGS=} -Wall -Werror"
 
+IPP_VERSION(PPSTACK)
+AC_SUBST(PPSTACK_VERSION,[$PPSTACK_VERSION])
+AC_SUBST(PPSTACK_BRANCH,[$PPSTACK_BRANCH])
+AC_SUBST(PPSTACK_SOURCE,[$PPSTACK_SOURCE])
+
 AC_SUBST([PPSTACK_CFLAGS])
 AC_SUBST([PPSTACK_LIBS])

trunk/ppStack/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppStack
 
-# PPSTACK_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSTACK_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSTACK_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppStackVersion.c, since it gets the version information
-# ppStackVersion.c: FORCE
-#       touch ppStackVersion.c
-# FORCE: ;
+# Force recompilation of ppStackVersion.c, since it gets the version information
+ppStackVersion.c: FORCE
+        touch ppStackVersion.c
+FORCE: ;
 
-ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(SVN_VERSION) -DPPSTACK_BRANCH=$(SVN_BRANCH) -DPPSTACK_SOURCE=$(SVN_SOURCE)
+ppStack_CFLAGS  = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSPHOT_CFLAGS) $(PPSTATS_CFLAGS) $(PPSTACK_CFLAGS) -DPPSTACK_VERSION=$(PPSTACK_VERSION) -DPPSTACK_BRANCH=$(PPSTACK_BRANCH) -DPPSTACK_SOURCE=$(PPSTACK_SOURCE)
 ppStack_LDFLAGS = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PSPHOT_LIBS)   $(PPSTATS_LIBS)   $(PPSTACK_LIBS)
 

trunk/ppStats/configure.ac

@@ -23 +23 @@
 CFLAGS="${CFLAGS=} -Wall -Werror -std=c99"
 
+IPP_VERSION(PPSTATS)
+AC_SUBST(PPSTATS_VERSION,[$PPSTATS_VERSION])
+AC_SUBST(PPSTATS_BRANCH,[$PPSTATS_BRANCH])
+AC_SUBST(PPSTATS_SOURCE,[$PPSTATS_SOURCE])
+
 AC_SUBST([PPSTATS_CFLAGS])
 AC_SUBST([PPSTATS_LIBS])

trunk/ppStats/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libppStats.la
 
-# PPSTATS_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSTATS_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSTATS_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppStatsVersion.c, since it gets the version information
-# ppStatsVersion.c: FORCE
-#       touch ppStatsVersion.c
-# FORCE: ;
+# Force recompilation of ppStatsVersion.c, since it gets the version information
+ppStatsVersion.c: FORCE
+        touch ppStatsVersion.c
+FORCE: ;
 
-libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(SVN_VERSION) -DPPSTATS_BRANCH=$(SVN_BRANCH) -DPPSTATS_SOURCE=$(SVN_SOURCE)
+libppStats_la_CFLAGS = $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPPSTATS_VERSION=$(PPSTATS_VERSION) -DPPSTATS_BRANCH=$(PPSTATS_BRANCH) -DPPSTATS_SOURCE=$(PPSTATS_SOURCE)
 libppStats_la_LDFLAGS = $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

trunk/ppSub/configure.ac

@@ -32 +32 @@
 CFLAGS="${CFLAGS} -Wall -Werror"
 
+IPP_VERSION(PPSUB)
+AC_SUBST(PPSUB_VERSION,[$PPSUB_VERSION])
+AC_SUBST(PPSUB_BRANCH,[$PPSUB_BRANCH])
+AC_SUBST(PPSUB_SOURCE,[$PPSUB_SOURCE])
+
 AC_SUBST([PPSUB_CFLAGS])
 AC_SUBST([PPSUB_LIBS])

trunk/ppSub/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = ppSub ppSubKernel
 
-# PPSUB_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PPSUB_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PPSUB_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of ppSubVersion.c, since it gets the version information
-# ppSubVersion.c: FORCE
-#       touch ppSubVersion.c
-# FORCE: ;
+# Force recompilation of ppSubVersion.c, since it gets the version information
+ppSubVersion.c: FORCE
+        touch ppSubVersion.c
+FORCE: ;
 
-ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(SVN_VERSION) -DPPSUB_BRANCH=$(SVN_BRANCH) -DPPSUB_SOURCE=$(SVN_SOURCE)
+ppSub_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS) -DPPSUB_VERSION=$(PPSUB_VERSION) -DPPSUB_BRANCH=$(PPSUB_BRANCH) -DPPSUB_SOURCE=$(PPSUB_SOURCE)
 ppSub_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
 

trunk/psastro/configure.ac

@@ -193 +193 @@
 echo "PSASTRO_LIBS: $PSASTRO_LIBS"
 
+IPP_VERSION(PSASTRO)
+AC_SUBST(PSASTRO_VERSION,[$PSASTRO_VERSION])
+AC_SUBST(PSASTRO_BRANCH,[$PSASTRO_BRANCH])
+AC_SUBST(PSASTRO_SOURCE,[$PSASTRO_SOURCE])
+
 AC_SUBST([PSASTRO_CFLAGS])
 AC_SUBST([PSASTRO_LIBS])

trunk/psastro/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsastro.la
 
-libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(SVN_VERSION) -DPSASTRO_BRANCH=$(SVN_BRANCH) -DPSASTRO_SOURCE=$(SVN_SOURCE)
+libpsastro_la_CFLAGS = $(PSASTRO_CFLAGS) $(PPSTATS_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSASTRO_VERSION=$(PSASTRO_VERSION) -DPSASTRO_BRANCH=$(PSASTRO_BRANCH) -DPSASTRO_SOURCE=$(PSASTRO_SOURCE)
 libpsastro_la_LDFLAGS = $(PSASTRO_LIBS) $(PPSTATS_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 
 # Force recompilation of psastroVersion.c, since it gets the version information
-# can we do this with dependency info?
-# psastroVersion.c: FORCE
-# touch psastroVersion.c
-# FORCE: ;
+psastroVersion.c: FORCE
+        touch psastroVersion.c
+FORCE: ;
 
 bin_PROGRAMS = psastro psastroExtract psastroModel psastroModelFit gpcModel

trunk/psconfig/psbuild

@@ -13 +13 @@
 $stop = "";
 $verbose = 0;
-$use_svn = 1;
 $svn_trunk = "";
+$offline = 0;
 
 $extlibs = "none";
@@ -90 +90 @@
         &bootstrap ();
     }
-    if ($ARGV[0] eq "-skip-svn") {
-        $use_svn = 0;
-        shift; next;
+    if ($ARGV[0] eq "-offline") {
+        $offline = 1;
+        shift; next;
     }
     if ($ARGV[0] eq "-env") {
@@ -167 +167 @@
 sub build_distribution {
 
-    # set environment variables used to supply SVN info to the compilation
-
-    if ($use_svn) {
-        # example dump from svn info:
-        # pikake: svn info
-        # Path: .
-        # URL: https://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/branches/eam_branches/eam_branch_20090303/ppImage
-        # Repository Root: https://svn.pan-starrs.ifa.hawaii.edu/repo/ipp
-        # Repository UUID: 60eb6cdc-a59c-4636-a4e0-dba66a9721fd
-        # Revision: 23158
-        # Node Kind: directory
-        # Schedule: normal
-        # Last Changed Author: price
-        # Last Changed Rev: 23125
-        # Last Changed Date: 2009-03-03 15:41:16 -1000 (Tue, 03 Mar 2009)
-        
-        $svn_version = `svnversion`; chomp $svn_version;
-        @svn_info = `svn info`;
-
-        # get the svn_root first:
-        foreach $line (@svn_info) {
-            if ($line =~ m|^Repository Root:|) {
-                ($svn_root) = $line =~ m|^Repository Root:\s*(\S*)|;
-                last;
-            }
-        }
-
-        # now get the branch and UUID values
-        foreach $line (@svn_info) {
-            if ($line =~ m|^URL:|) {
-                ($svn_branch) = $line =~ m|^URL:\s*$svn_root/*(\S*)|;
-            }
-            if ($line =~ m|^Repository UUID:|) {
-                ($svn_source) = $line =~ m|^Repository UUID:\s*(\S*)|;
-            }
-        }
-        
-        $ENV{SVN_VERSION} = $svn_version;
-        $ENV{SVN_BRANCH}  = $svn_branch;
-        $ENV{SVN_SOURCE}  = $svn_source;
-    } else {
-        # alternatively, grab these from the following files:
-        if (! -e "SVNINFO") { 
-            print "missing SVNINFO file for repository info, skipping\n";
-        } else {
-            @svn_info = `cat SVNINFO`;
-            foreach $line (@svn_info) {
-                ($name, $value) = split (" ", $line);
-                $ENV{$name} = $value;
-            }
-        }
-    }
-    print "SVN_VERSION $ENV{SVN_VERSION}\n";
-    print "SVN_BRANCH  $ENV{SVN_BRANCH}\n";
-    print "SVN_SOURCE  $ENV{SVN_SOURCE}\n";
-
     # use psconfig.csh to set needed build aliases
     if ($extlibs eq "check") {
@@ -279 +223 @@
     if ($optimize) { $psopts = "$psopts --enable-optimize"; }
     if ($profile)  { $psopts = "$psopts --enable-profile --disable-shared --enable-static"; }
+    $psopts .= " --disable-version" if $offline;
 
     $homedir = `pwd`; chomp $homedir;
@@ -299 +244 @@
 
         if ($svn_trunk && (!-d $workdir || !-r $workdir || !-x $workdir)) {
-            # try trunk instead
+            # try trunk instead
             print STDERR "$module[$i] missing from local path, trying trunk path\n";
-            $workdir = "$svn_trunk/$module[$i]";
+            $workdir = "$svn_trunk/$module[$i]";
         }
 

trunk/psphot/configure.ac

@@ -204 +204 @@
 echo "PSPHOT_LIBS: $PSPHOT_LIBS"
 
+IPP_VERSION(PSPHOT)
+AC_SUBST(PSPHOT_VERSION,[$PSPHOT_VERSION])
+AC_SUBST(PSPHOT_BRANCH,[$PSPHOT_BRANCH])
+AC_SUBST(PSPHOT_SOURCE,[$PSPHOT_SOURCE])
+
 AC_SUBST([PSPHOT_CFLAGS])
 AC_SUBST([PSPHOT_LIBS])

trunk/psphot/src/Makefile.am

@@ -1 +1 @@
 lib_LTLIBRARIES = libpsphot.la
 
-# PSPHOT_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-# PSPHOT_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-# PSPHOT_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
-# 
-# # Force recompilation of psphotVersion.c, since it gets the version information
-# psphotVersion.c: FORCE
-#       touch psphotVersion.c
-# FORCE: ;
+# Force recompilation of psphotVersion.c, since it gets the version information
+psphotVersion.c: FORCE
+        touch psphotVersion.c
+FORCE: ;
 
-libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(SVN_SOURCE)
+libpsphot_la_CFLAGS = $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS) -DPSPHOT_VERSION=$(PSPHOT_VERSION) -DPSPHOT_BRANCH=$(PSPHOT_BRANCH) -DPSPHOT_SOURCE=$(PSPHOT_SOURCE)
 libpsphot_la_LDFLAGS = $(PSPHOT_LIBS) $(PSMODULE_LIBS) $(PSLIB_LIBS)
 

trunk/pswarp/configure.ac

@@ -37 +37 @@
 echo "PSWARP_LIBS: $PSWARP_LIBS"
 
+IPP_VERSION(PSWARP)
+AC_SUBST(PSWARP_VERSION,[$PSWARP_VERSION])
+AC_SUBST(PSWARP_BRANCH,[$PSWARP_BRANCH])
+AC_SUBST(PSWARP_SOURCE,[$PSWARP_SOURCE])
+
 AC_SUBST([PSWARP_CFLAGS])
 AC_SUBST([PSWARP_LIBS])

trunk/pswarp/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = pswarp
-
-PSWARP_VERSION=`if [ -e ../../VERSION ]; then cat ../../VERSION; else svnversion; fi`
-PSWARP_BRANCH=`if [ -e ../../BRANCH ]; then cat ../../BRANCH; else svn info | sed -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'; fi`
-PSWARP_SOURCE=`if [ -e ../../SOURCE ]; then cat ../../SOURCE; else svn info | sed -n -e 's/Repository UUID: // p'; fi`
 
 # Force recompilation of pswarpVersion.c, since it gets the version information