runtime: Add the Go language version information to the Version output.

From-SVN: r219976

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 727662d5f1dc65bd1ebea2065eac5f2c17826e1b..f6f967e22a676b18c3559ca72e40125461192821 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -971,7 +971,7 @@ s-version: Makefile
        rm -f version.go.tmp
        echo "package runtime" > version.go.tmp
        echo 'const defaultGoroot = "$(prefix)"' >> version.go.tmp
-       echo 'const theVersion = "'`$(GOC) --version | sed 1q`'"' >> version.go.tmp
+       echo 'const theVersion = "'`cat $(srcdir)/VERSION | sed 1q`' '`$(GOC) --version | sed 1q`'"' >> version.go.tmp
        echo 'const theGoarch = "'$(GOARCH)'"' >> version.go.tmp
        echo 'const theGoos = "'$(GOOS)'"' >> version.go.tmp
        echo 'const theGccgoToolDir = "$(libexecsubdir)"' >> version.go.tmp

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 7c8fc320d93b0319cf378086ffa71f3334411cb5..c908869cd61f074430dd3f2875ada7c46c36e789 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -4387,7 +4387,7 @@ s-version: Makefile
        rm -f version.go.tmp
        echo "package runtime" > version.go.tmp
        echo 'const defaultGoroot = "$(prefix)"' >> version.go.tmp
-       echo 'const theVersion = "'`$(GOC) --version | sed 1q`'"' >> version.go.tmp
+       echo 'const theVersion = "'`cat $(srcdir)/VERSION | sed 1q`' '`$(GOC) --version | sed 1q`'"' >> version.go.tmp
        echo 'const theGoarch = "'$(GOARCH)'"' >> version.go.tmp
        echo 'const theGoos = "'$(GOOS)'"' >> version.go.tmp
        echo 'const theGccgoToolDir = "$(libexecsubdir)"' >> version.go.tmp

diff --git a/libgo/VERSION b/libgo/VERSION
new file mode 100644 (file)
index 0000000..40c8f5c
--- /dev/null
+++ b/libgo/VERSION
@@ -0,0 +1 @@
+go1.4
\ No newline at end of file

diff --git a/libgo/merge.sh b/libgo/merge.sh
index 53af8a9899fe968f5aa01bb8f39a0165efacbb15..6b9e5bb9932751bad8efcc82af91605f63c9e5a9 100755 (executable)
--- a/libgo/merge.sh
+++ b/libgo/merge.sh
@@ -136,6 +136,16 @@ merge_c() {
   fi
 }
 
+if test -f VERSION; then
+  if ! cmp -s ${NEWDIR}/VERSION VERSION; then
+    cp ${NEWDIR}/VERSION .
+  fi
+else
+  if test -f ${NEWDIR}/VERSION; then
+    cp ${NEWDIR}/VERSION .
+  fi
+fi
+
 (cd ${NEWDIR}/src && find . -name '*.go' -print) | while read f; do
   oldfile=${OLDDIR}/src/$f
   newfile=${NEWDIR}/src/$f