Commit b4fb00b6 authored by Andrew Gerrand's avatar Andrew Gerrand

*l/*c: add -V flag to display version number

R=rsc
CC=golang-dev
https://golang.org/cl/204044
parent abe6a5b0
...@@ -23,6 +23,8 @@ Options new in this version: ...@@ -23,6 +23,8 @@ Options new in this version:
-L dir1,dir2,.. -L dir1,dir2,..
Search for libraries (package files) in the comma-separated list of directories. Search for libraries (package files) in the comma-separated list of directories.
The default is the single location $GOROOT/pkg/$GOOS_arm. The default is the single location $GOROOT/pkg/$GOOS_arm.
-V
Print the linker version.
*/ */
package documentation package documentation
...@@ -141,6 +141,9 @@ main(int argc, char *argv[]) ...@@ -141,6 +141,9 @@ main(int argc, char *argv[])
if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1])) if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1]))
readundefs(ARGF(), SIMPORT); readundefs(ARGF(), SIMPORT);
break; break;
case 'V':
print("%cl version %s\n", thechar, getgoversion());
errorexit();
} ARGEND } ARGEND
USED(argc); USED(argc);
......
...@@ -35,6 +35,8 @@ Options new in this version: ...@@ -35,6 +35,8 @@ Options new in this version:
-L dir1,dir2,.. -L dir1,dir2,..
Search for libraries (package files) in the comma-separated list of directories. Search for libraries (package files) in the comma-separated list of directories.
The default is the single location $GOROOT/pkg/$GOOS_amd64. The default is the single location $GOROOT/pkg/$GOOS_amd64.
-V
Print the linker version.
*/ */
......
...@@ -136,6 +136,9 @@ main(int argc, char *argv[]) ...@@ -136,6 +136,9 @@ main(int argc, char *argv[])
if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1])) if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1]))
readundefs(ARGF(), SIMPORT); readundefs(ARGF(), SIMPORT);
break; break;
case 'V':
print("%cl version %s\n", thechar, getgoversion());
errorexit();
} ARGEND } ARGEND
if(argc != 1) if(argc != 1)
......
...@@ -32,6 +32,8 @@ Options new in this version: ...@@ -32,6 +32,8 @@ Options new in this version:
-L dir1,dir2,.. -L dir1,dir2,..
Search for libraries (package files) in the comma-separated list of directories. Search for libraries (package files) in the comma-separated list of directories.
The default is the single location $GOROOT/pkg/$GOOS_386. The default is the single location $GOROOT/pkg/$GOOS_386.
-V
Print the linker version.
*/ */
......
...@@ -142,6 +142,9 @@ main(int argc, char *argv[]) ...@@ -142,6 +142,9 @@ main(int argc, char *argv[])
if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1])) if(argv[1] != nil && argv[1][0] != '-' && !isobjfile(argv[1]))
readundefs(ARGF(), SIMPORT); readundefs(ARGF(), SIMPORT);
break; break;
case 'V':
print("%cl version %s\n", thechar, getgoversion());
errorexit();
} ARGEND } ARGEND
if(argc != 1) if(argc != 1)
......
...@@ -38,6 +38,8 @@ Flags: ...@@ -38,6 +38,8 @@ Flags:
disable optimization disable optimization
-S -S
write assembly language text to standard output write assembly language text to standard output
-V
print the compiler version
There are also a number of debugging flags; run the command with no arguments There are also a number of debugging flags; run the command with no arguments
to get a usage message. to get a usage message.
......
...@@ -65,6 +65,9 @@ main(int argc, char *argv[]) ...@@ -65,6 +65,9 @@ main(int argc, char *argv[])
case 'I': case 'I':
addidir(ARGF()); addidir(ARGF());
break; break;
case 'V':
print("%cg version %s\n", thechar, getgoversion());
errorexit();
} ARGEND } ARGEND
if(argc < 1) if(argc < 1)
...@@ -168,6 +171,7 @@ usage: ...@@ -168,6 +171,7 @@ usage:
print(" -h panic on an error\n"); print(" -h panic on an error\n");
print(" -o file specify output file\n"); print(" -o file specify output file\n");
print(" -S print the assembly language\n"); print(" -S print the assembly language\n");
print(" -V print the compiler version\n");
print(" -w print the parse tree after typing\n"); print(" -w print the parse tree after typing\n");
print(" -x print lex tokens\n"); print(" -x print lex tokens\n");
exit(0); exit(0);
......
...@@ -117,7 +117,7 @@ $(LIB): $(OFILES) ...@@ -117,7 +117,7 @@ $(LIB): $(OFILES)
$(CC) -c $(CFLAGS) $< $(CC) -c $(CFLAGS) $<
goos.$O: goos.c goos.$O: goos.c
$(CC) -c $(CFLAGS) -DGOOS='"$(GOOS)"' -DGOARCH='"$(GOARCH)"' -DGOROOT='"$(GOROOT)"' $< $(CC) -c $(CFLAGS) -DGOOS='"$(GOOS)"' -DGOARCH='"$(GOARCH)"' -DGOROOT='"$(GOROOT)"' -DGOVERSION='"'"$$(../version.bash)"'"' $<
clean: clean:
rm -f *.$O *.6 6.out $(LIB) rm -f *.$O *.6 6.out $(LIB)
......
...@@ -33,3 +33,9 @@ getgoroot(void) ...@@ -33,3 +33,9 @@ getgoroot(void)
{ {
return defgetenv("GOROOT", GOROOT); return defgetenv("GOROOT", GOROOT);
} }
char*
getgoversion(void)
{
return GOVERSION;
}
#!/usr/bin/env bash
# Copyright 2010 The Go Authors. All rights reserved.
# Use of this source code is governed by a BSD-style
# license that can be found in the LICENSE file.
# Check that we can use 'hg'
if ! hg version > /dev/null 2>&1; then
echo 'hg not installed' 1>&2
exit 2
fi
# Get numerical revision
VERSION="`hg identify -n`"
# Append tag if not 'tip'
TAG=$(hg identify -t | sed 's!/release!!')
if [[ "$TAG" != "tip" ]]; then
VERSION="$VERSION $TAG"
fi
echo $VERSION
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment