kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

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

Browse source 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi 2015-03-03 12:41:26 -07:00
parent 8e107a9321
commit 8625a281c6
4 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project/make.sh
View file

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

2
project/make/.dockerinit
View file

@ -2,7 +2,7 @@
set -e set -e
IAMSTATIC="true" 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 # dockerinit still needs to be a static binary, even if docker is dynamic
go build \ go build \

8
project/make/.dockerversion → project/make/.go-autogen
View file

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

2
project/make/binary
View file

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