Changeset 2170

Timestamp:

11/15/11 08:05:58 (18 months ago)

Author:

jkoshy

Message:

Fix a bug in the make-toolchain-version script.

• Deal with exported source trees in a sensible way.
• Improve a few comments.

Ticket: #358

Files:

• trunk/libelftc/make-toolchain-version (modified) (2 diffs)

trunk/libelftc/make-toolchain-version

@@ -56 +56 @@
 [ -n "${top}" ] || usage
 
-# Try to determine the tree version.
+# Try to determine the in-tree revision number.
 #
-# - If using SVN, use the `svninfo' tool.
-# - If using CVS, use the string `unknown'.
-# - Otherwise use `git --describe'.
+# This script attempts to handle the case where our sources have been
+# incorporated into an operating system's base sources.
+#
+# - If SVN is detected, we use the `svninfo' tool to determine the
+#   in-tree revision number.
+# - If CVS is detected, we use the string `unknown'.
+# - Otherwise, we use `git --describe'.
 
 curdir=`pwd`
 cd ${top} || usage "ERROR: Cannot change directory to \"${top}\"."
 
-versionstring=""
-if [ -d .svn ]; then
-    versionstring="svn:"$(svnversion)
-elif [ -d CVS ]; then
-    versionstring="cvs:unknown"
-else # Try Git
-    versionstring="git:"$(git describe --all --dirty --long)
+if [ -d .svn ]; then            # FreeBSD and SF.Net sources.
+    versionstring=" svn:"$(svnversion)
+elif [ -d CVS ]; then           # NetBSD.
+    versionstring=" cvs:unknown"
+else                            # DragonFlyBSD.
+    versionstring=" git:"$(git describe --all --dirty --long 2> /dev/null)
 
-    if [ ${?} -ne 0 ]; then
-        usage "Cannot determine tree version."
+    # Cannot determine an in-tree version number.
+    if [ $? -ne 0 ]; then
+        versionstring=""
     fi
 fi
@@ -95 +99 @@
 elftc_version(void)
 {
-        return "${elftcname} ${branch} ${buildhost} ${versionstring}";
+        return "${elftcname} ${branch} ${buildhost}${versionstring}";
 }
 EOF