@@ -1,4 +1,3 @@

 /output

-/pkg/version/autogenerated.go

 /third_party/pkg

 /*.etcd

@@ -48,7 +48,8 @@ func main() {

 		Use:   "version",

 		Short: "Display version",

 		Run: func(c *cobra.Command, args []string) {

-			major, minor, git := version.Get()

+			info := version.Get()

+			major, minor, git := info.Major, info.Minor, info.GitCommit

 			fmt.Printf("openshift version %s.%s, build %s\n", major, minor, git)

 			fmt.Printf("kubernetes %v\n", kubeversion.Get())

 		},

deleted file mode 100755

@@ -1,11 +0,0 @@

-#!/bin/bash

-

-$(dirname $0)/../third_party/src/github.com/GoogleCloudPlatform/kubernetes/hack/version-gen.sh

-

-# TODO: when we start making tags, switch to git describe?

-desc=$(git rev-list --abbrev-commit --max-count=1 HEAD)

-tab=$'\t'

-script="6s/.*/${tab}commitFromGit = \`${desc}\`/"

-infile="$(dirname $0)/../pkg/version/template.go"

-outfile="$(dirname $0)/../pkg/version/autogenerated.go"

-sed "${script}" "${infile}" > "${outfile}"

deleted file mode 100644

@@ -1,7 +0,0 @@

-package version

-

-// This file is the template for the machine-edited autogenerated.go.

-// Do not modify this file without also modifying hack/version-gen.sh.

-var (

-	placeholder interface{}

-)

@@ -1,5 +1,53 @@

+/*

+Copyright 2014 Google Inc. All rights reserved.

+

+Licensed under the Apache License, Version 2.0 (the "License");

+you may not use this file except in compliance with the License.

+You may obtain a copy of the License at

+

+    http://www.apache.org/licenses/LICENSE-2.0

+

+Unless required by applicable law or agreed to in writing, software

+distributed under the License is distributed on an "AS IS" BASIS,

+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+See the License for the specific language governing permissions and

+limitations under the License.

+*/

+

 package version

-func Get() (major, minor, gitCommit string) {

-	return "0", "1", commitFromGit

+import (

+	"fmt"

+)

+

+// commitFromGit is a constant representing the source version that

+// generated this build. It should be set during build via -ldflags.

+var commitFromGit string

+

+// Info contains versioning information.

+// TODO: Add []string of api versions supported? It's still unclear

+// how we'll want to distribute that information.

+type Info struct {

+	Major     string `json:"major" yaml:"major"`

+	Minor     string `json:"minor" yaml:"minor"`

+	GitCommit string `json:"gitCommit" yaml:"gitCommit"`

+}

+

+// Get returns the overall codebase version. It's for detecting

+// what code a binary was built from.

+func Get() Info {

+	return Info{

+		Major:     "0",

+		Minor:     "1",

+		GitCommit: commitFromGit,

+	}

+}

+

+// String returns info as a human-friendly version string.

+func (info Info) String() string {

+	commit := info.GitCommit

+	if commit == "" {

+		commit = "(unknown)"

+	}

+	return fmt.Sprintf("version %s.%s, build %s", info.Major, info.Minor, commit)

 }