Bump version to 2.9; add global version file (#1524)

* add a version file

use version file for deb and python pakcages
print version number in minimega

* remove original debian control file

* fix typo in detecting python install

* fix versioning in other scripts

VERSION

@@ -0,0 +1 @@
+VERSION=2.9

cmd/miniccc/main_linux.go

@@ -50,7 +50,7 @@ func main() {
 	flag.Parse()
 
 	if *f_version {
-		fmt.Println("miniccc", version.Revision, version.Date)
+		fmt.Println("miniccc", version.Version, version.Revision, version.Date)
 		fmt.Println(version.Copyright)
 		os.Exit(0)
 	}

cmd/minimega/main.go

@@ -116,7 +116,7 @@ func main() {
 	}
 
 	if *f_version {
-		fmt.Println("minimega", version.Revision, version.Date)
+		fmt.Println("minimega", version.Version, version.Revision, version.Date)
 		fmt.Println(version.Copyright)
 		os.Exit(0)
 	}

cmd/minimega/misc_cli.go

@@ -365,7 +365,7 @@ func cliDebug(ns *Namespace, c *minicli.Command, resp *minicli.Response) error {
 }
 
 func cliVersion(ns *Namespace, c *minicli.Command, resp *minicli.Response) error {
-	resp.Response = fmt.Sprintf("minimega %v %v", version.Revision, version.Date)
+	resp.Response = fmt.Sprintf("minimega %v %v %v", version.Version, version.Revision, version.Date)
 	return nil
 }
 

lib/MANIFEST.in

@@ -0,0 +1 @@
+include VERSION

lib/setup.py

@@ -1,11 +1,12 @@
-import os
-import shutil
 from distutils.core import setup
 
 
 with open("README", "r") as readme_file:
     readme_content = readme_file.read()
 
+with open("VERSION", "r") as version_file:
+    version = version_file.read().split('=')[1].strip()
+
 setup(
     name='minimega',
     description="Python API for minimega",
@@ -14,7 +15,7 @@
     long_description=readme_content,
     license="GPLv3",
     url="https://minimega.org",
-    version="2.7",
+    version=version,
     py_modules=["minimega"],
     classifiers=[
         "Development Status :: 5 - Production/Stable",

packaging/debian/build.bash

@@ -28,6 +28,12 @@ cp -r $MM/LICENSES $DOCS/
 
 echo COPIED FILES
 
+# substitute version for control file
+source $MM/VERSION
+sed -e 's/${version}/'"$VERSION"'/g' minimega/DEBIAN/control.base > minimega/DEBIAN/control
+
 echo BUILDING PACKAGE...
 (cd $SCRIPT_DIR && fakeroot dpkg-deb -b minimega)
+rm minimega/DEBIAN/control
 echo DONE
+

packaging/debian/minimega/DEBIAN/control → packaging/debian/minimega/DEBIAN/control.base

@@ -1,5 +1,5 @@
 Package: minimega
-Version: 2.8
+Version: ${version}
 Section: utils
 Priority: extra
 Architecture: amd64

scripts/build.bash

@@ -6,12 +6,14 @@ ROOT_DIR="$( cd ${SCRIPT_DIR}/.. && pwd )"
 . $SCRIPT_DIR/env.bash
 
 # set the version from the repo
-VERSION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
+source $ROOT_DIR/VERSION
+REVISION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
 DATE=`date --rfc-3339=date`
 echo "package version
 
 var (
-	Revision = \"$VERSION\"
+	Version  = \"$VERSION\"
+	Revision = \"$REVISION\"
 	Date     = \"$DATE\"
 )" > $ROOT_DIR/internal/version/version.go
 
@@ -63,12 +65,19 @@ $ROOT_DIR/bin/pyapigen -out $ROOT_DIR/lib/minimega.py $ROOT_DIR/bin/minimega
 
 # If python is installed, build a source distribution for the
 # minimega Python bindings.
-if [ -x "$(command -v python)" ]; then
+py_path=$(command -v python3)
+if [ -z "$py_path" ]; then
+    py_path=$(command -v python)
+fi
+if [ ! -z "$py_path" ]; then
+    echo "BUILD PYTHON DIST"
     cp $ROOT_DIR/README $ROOT_DIR/lib/
+    cp $ROOT_DIR/VERSION $ROOT_DIR/lib/
     pushd $ROOT_DIR/lib
-    python setup.py --quiet sdist
+    $py_path setup.py --quiet sdist
     popd
     rm $ROOT_DIR/lib/README
+    rm $ROOT_DIR/lib/VERSION
 fi
 
 unset GOOS

scripts/check.bash

@@ -6,12 +6,14 @@ ROOT_DIR="$( cd ${SCRIPT_DIR}/.. && pwd )"
 . $SCRIPT_DIR/env.bash
 
 # set the version from the repo
-VERSION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
+source $ROOT_DIR/VERSION
+REVISION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
 DATE=`date --rfc-3339=date`
 echo "package version
 
 var (
-	Revision = \"$VERSION\"
+	Version  = \"$VERSION\"
+	Revision = \"$REVISION\"
 	Date     = \"$DATE\"
 )" > $ROOT_DIR/internal/version/version.go
 

scripts/test.bash

@@ -6,12 +6,14 @@ ROOT_DIR="$( cd ${SCRIPT_DIR}/.. && pwd )"
 . $SCRIPT_DIR/env.bash
 
 # set the version from the repo
-VERSION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
+source $ROOT_DIR/VERSION
+REVISION=`git --git-dir $ROOT_DIR/.git rev-parse HEAD`
 DATE=`date --rfc-3339=date`
 echo "package version
 
 var (
-	Revision = \"$VERSION\"
+	Version  = \"$VERSION\"
+	Revision = \"$REVISION\"
 	Date     = \"$DATE\"
 )" > $ROOT_DIR/internal/version/version.go