# HG changeset patch # User mhessling@81767d24-ef19-dc11-ae90-00e081727c95 # Date 1316339337 0 # Node ID 5ff264b41985e07bd88a9cfa54d6370f81762113 # Parent 13d046d301f7992edd4bc78a09984918221cd74f Change to method of obtaining SVN revision number diff -r 13d046d301f7 -r 5ff264b41985 makefile.emx --- a/makefile.emx Sat Sep 17 19:47:04 2011 +0000 +++ b/makefile.emx Sun Sep 18 09:48:57 2011 +0000 @@ -9,7 +9,7 @@ COMPRESS = lxlite VER = 21 VERDOT = 2.1 -VERREV = $(shell svnversion -n . | cut -d ":" -f 1 | tr -d MS) +VERREV = $(shell os2\svnrev.cmd) DEFS = LIBS = diff -r 13d046d301f7 -r 5ff264b41985 os2/svnrev.cmd --- a/os2/svnrev.cmd Sat Sep 17 19:47:04 2011 +0000 +++ b/os2/svnrev.cmd Sun Sep 18 09:48:57 2011 +0000 @@ -1,16 +1,16 @@ -/* REXX script to get the svn revision and save it to SVN.REV. */ -"svnversion -n . | rxqueue" -/* Using PARSE PULL preserves case */ -Parse Pull sval -/* If it is a double value get the first value */ -Parse Var sval ver ':' newver 'M' 'S' -/* Remove trailing M or S from the version */ -Parse Var ver tmpver 'M' -Parse Var tmpver ver 'S' -err = LINEOUT('SVN.REV', 'VERREV=' || ver, 1) -/* Check for an error. */ -IF err \== 0 THEN DO -Bad: - SAY "ERROR:" STREAM('SVN.REV', 'D') - RETURN -END +/* REXX script to get the svn revision and display it. */ +Trace o +Address System 'svnversion . | rxqueue > nul:' +/* default version to 0, if svnversion doesn't exist or no .svn here */ +ver = 0 +If rc = 0 Then + Do + /* Using PARSE PULL preserves case */ + /* If it is a double value get the first value only */ + Parse Pull sval ver ':' . + If Strip( ver ) = '' Then ver = sval + If ver = 'exported' Then ver = 0 + If Datatype( Right( ver, 1 ) ) \= 'NUM' Then ver = Substr( ver, 1, Length( ver) - 1 ) + End +Say ver +Exit 0