Changeset 38034 for trunk/magic/remove/src

Timestamp:

Mar 28, 2015, 7:10:18 AM (11 years ago)

Author:

eugene

Message:

replace Makefile.am sed code with pslib-setsvnversion

Location:

trunk/magic/remove/src

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)

trunk/magic/remove/src

@@ -11 +11 @@
 config.h.in
 stamp-h1
+streaksVersionDefinitions.h.tmp

@@ -11 +11 @@
 config.h.in
 stamp-h1
+streaksVersionDefinitions.h.tmp

trunk/magic/remove/src/Makefile.am

@@ -1 @@
-if HAVE_SVNVERSION
-STREAKS_VERSION=`$(SVNVERSION) ..`
-else
-STREAKS_VERSION="UNKNOWN"
-endif
-
-if HAVE_SVN
-STREAKS_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 }'`
-STREAKS_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
-else
-STREAKS_BRANCH="UNKNOWN"
-STREAKS_SOURCE="UNKNOWN"
-endif
 
 # Force recompilation of streaksVersion.c, since it gets the version information
 streaksVersion.c: streaksVersionDefinitions.h
 streaksVersionDefinitions.h: streaksVersionDefinitions.h.in FORCE
-        -$(RM) streaksVersionDefinitions.h
-        $(SED) -e "s|@STREAKS_VERSION@|\"$(STREAKS_VERSION)\"|" -e "s|@STREAKS_BRANCH@|\"$(STREAKS_BRANCH)\"|" -e "s|@STREAKS_SOURCE@|\"$(STREAKS_SOURCE)\"|" streaksVersionDefinitions.h.in > streaksVersionDefinitions.h
+        pslib-setsvnversion.pl STREAKS streaksVersionDefinitions.h.in streaksVersionDefinitions.h
 FORCE: ;
 

@@ -11 +11 @@
 config.h.in
 stamp-h1
+streaksVersionDefinitions.h.tmp