Merge pull request #15 from dbkinder/master

doc: update build process to get RC_VERSION
This commit is contained in:
David Kinder 2018-03-08 22:52:07 -08:00 committed by GitHub
commit d621217225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 5 deletions

View File

@ -61,6 +61,7 @@ author = u'Project ARCN developers'
try:
version_major = None
version_minor = None
version_rc = None
for line in open(os.path.normpath("../acrn-hypervisor/Makefile")) :
if line.count("=") :
key, val = [x.strip() for x in line.split('=', 2)]
@ -68,13 +69,15 @@ try:
version_major = val
if key == 'MINOR_VERSION':
version_minor = val
if version_major and version_minor :
if key == 'RC_VERSION':
version_rc = val
if version_major and version_minor and version_rc :
break
except:
pass
finally:
if version_major and version_minor :
version = release = "v " + version_major + '.' + version_minor
if version_major and version_minor and version_rc :
version = release = "v " + version_major + '.' + version_minor + '.' + version_rc
else:
sys.stderr.write('Warning: Could not extract hypervisor version from Makefile\n')
version = release = "unknown"

View File

@ -11,5 +11,15 @@ if [ ! -d "../acrn-devicemodel" ]; then
exit -1
fi
cd ../acrn-hypervisor;git pull
cd ../acrn-devicemodel;git pull
cd ../acrn-hypervisor
git checkout master;
git fetch upstream
git merge upstream/master
git push origin master
cd ../acrn-devicemodel
git checkout master;
git fetch upstream
git merge upstream/master
git push origin master