Changeset 38016

Timestamp:

Mar 26, 2015, 3:12:16 PM (11 years ago)

Author:

eugene

Message:

convert to pslib-setsvnversion.pl to parse svn version info

Location:

branches/eam_branches/ipp-20150326/psLib

Files:

• Makefile.am (modified) (1 diff)
• etc/Makefile.am (modified) (1 diff)
• etc/pslib-setsvnversion.pl (moved) (moved from branches/eam_branches/ipp-20150326/psastro/src/setsvnversion.pl ) (1 diff)
• src/sys/Makefile.am (modified) (1 diff)

branches/eam_branches/ipp-20150326/psLib/Makefile.am

@@ -1 +1 @@
 SUBDIRS = m4 $(SUBDIR)
 
-bin_SCRIPTS = pslib-config 
+bin_SCRIPTS = pslib-config
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA= pslib.pc

branches/eam_branches/ipp-20150326/psLib/etc/Makefile.am

@@ -1 +1 @@
 BUILT_SOURCES = pslib.config
 EXTRA_DIST = pslib.config.template
+
+bin_SCRIPTS = pslib-setsvnversion.pl
 
 # this is done instead of using autoconf to delay the expansion of datadir

branches/eam_branches/ipp-20150326/psLib/etc/pslib-setsvnversion.pl

@@ -87 +87 @@
 close (FILE);
 
+if (! -e $ARGV[2]) {
+    if ($VERBOSE) { 
+        print "prior $ARGV[2] not found, replacing with $output\n";
+    }
+    rename $output, $ARGV[2];
+    exit 0;
+}
+
 $difflines = `diff $ARGV[2] $output`;
 if ($difflines eq "") {
-    if ($VERBOSE) { print "no change to $ARGV[2], keeping old version\n"; }
+    print "  setsvnversion.pl: no change to $ARGV[2], keeping old version\n";
 } else {
     if ($VERBOSE) { 

branches/eam_branches/ipp-20150326/psLib/src/sys/Makefile.am

@@ -3 +3 @@
 noinst_LTLIBRARIES = libpslibsys.la
 
-if HAVE_SVNVERSION
-PSLIB_VERSION=`$(SVNVERSION) ../..`
-else
-PSLIB_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-PSLIB_BRANCH=`$(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 }'`
-PSLIB_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-PSLIB_BRANCH="UNKNOWN"
-PSLIB_SOURCE="UNKNOWN"
-endif
-
 # Force recompilation of psConfigure.c, since it gets the version information
 psConfigure.c: psVersionDefinitions.h
 psVersionDefinitions.h: psVersionDefinitions.h.in FORCE
-        -$(RM) psVersionDefinitions.h
-        $(SED) -e "s|@PSLIB_VERSION@|\"$(PSLIB_VERSION)\"|" -e "s|@PSLIB_BRANCH@|\"$(PSLIB_BRANCH)\"|" -e "s|@PSLIB_SOURCE@|\"$(PSLIB_SOURCE)\"|" psVersionDefinitions.h.in > psVersionDefinitions.h
+        ../../etc/pslib-setsvnversion.pl PSLIB psVersionDefinitions.h.in psVersionDefinitions.h
 FORCE: ;