Merge pull request #11138 from tianon/go-autogen

Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here

project/make.sh

@@ -101,7 +101,7 @@ fi
 # Use these flags when compiling the tests and final binary
 
 IAMSTATIC='true'
-source "$(dirname "$BASH_SOURCE")/make/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/make/.go-autogen"
 LDFLAGS='-w'
 
 LDFLAGS_STATIC='-linkmode external'

project/make/.dockerinit

@@ -2,7 +2,7 @@
 set -e
 
 IAMSTATIC="true"
-source "$(dirname "$BASH_SOURCE")/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
 # dockerinit still needs to be a static binary, even if docker is dynamic
 go build \

project/make/.dockerversion → project/make/.go-autogen

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 rm -rf autogen
+
 mkdir -p autogen/dockerversion
 cat > autogen/dockerversion/dockerversion.go <<EOF
 // AUTOGENERATED FILE; see $BASH_SOURCE
@@ -9,14 +10,7 @@ package dockerversion
 var (
 	GITCOMMIT string = "$GITCOMMIT"
 	VERSION   string = "$VERSION"
-)
-EOF
 
-cat > autogen/dockerversion/static.go <<EOF
-// AUTOGENERATED FILE; see $BASH_SOURCE
-package dockerversion
-
-var (
 	IAMSTATIC string = "${IAMSTATIC:-true}"
 	INITSHA1  string = "$DOCKER_INITSHA1"
 	INITPATH  string = "$DOCKER_INITPATH"

project/make/binary

@@ -11,7 +11,7 @@ if [[ "$(uname -s)" == CYGWIN* ]]; then
 	DEST=$(cygpath -mw $DEST)
 fi
 
-source "$(dirname "$BASH_SOURCE")/.dockerversion"
+source "$(dirname "$BASH_SOURCE")/.go-autogen"
 
 go build \
 	-o "$DEST/$BINARY_FULLNAME" \