Browse Source

The "r" is prepended to svn revision numbers automatically (in prism.getVersion and printversion.sh).

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@6680 bbc10eb1-c90d-0410-af57-cb519fbb1720
master
Dave Parker 13 years ago
parent
commit
36adda1471
  1. 4
      prism/src/prism/Prism.java
  2. 2
      prism/src/scripts/printversion.sh

4
prism/src/prism/Prism.java

@ -55,7 +55,7 @@ public class Prism implements PrismSettingsListener
/** Optional PRISM version suffix (e.g. "dev", "beta"). Read from prism.Version. */
private static String versionSuffix = prism.Version.versionSuffixString;
/** Build number (e.g. "r6667"). Defaults to "" (undefined), read from prism.Revision class if present. */
/** Build number (e.g. "6667"). Defaults to "" (undefined), read from prism.Revision class if present. */
private static String buildNumber = "";
static {
try {
@ -569,7 +569,7 @@ public class Prism implements PrismSettingsListener
v += "." + versionSuffix;
// In this case, also append any build number
if (buildNumber.length() > 0)
v += "." + buildNumber;
v += ".r" + buildNumber;
}
return v;
}

2
prism/src/scripts/printversion.sh

@ -23,7 +23,7 @@ if [ -f "$SRC_DIR"/prism/Version.java ]; then
if [ -f "$SRC_DIR"/prism/Revision.java ]; then
REVISION_SVN=`grep svnRevision "$SRC_DIR"/prism/Revision.java | sed -E 's/[^"]+"([^"]*)"[^"]+/\1/'`
if [ "$REVISION_SVN" != "" ]; then
/bin/echo -n ".$REVISION_SVN"
/bin/echo -n ".r$REVISION_SVN"
fi
fi
fi

Loading…
Cancel
Save