apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

make build number attach to release number 0 in rpm package name.

Browse Source 
1. if --prerelease specified, the release number equals to
        0.buildnumber
2. if --prerelease omitted, the release number equals to
        1 or --release-version if --release-version specified
This commit is contained in:
frank 2011-11-28 14:44:16 -08:00
parent 35845a075c
commit 630bb2e278
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cloud.spec
View File

@ -4,14 +4,12 @@
# DISABLE the post-percentinstall java repacking and line number stripping # DISABLE the post-percentinstall java repacking and line number stripping
# we need to find a way to just disable the java repacking and line number stripping, but not the autodeps # we need to find a way to just disable the java repacking and line number stripping, but not the autodeps
%define _rel 1
Name: cloud Name: cloud
Summary: Cloud.com Stack Summary: Cloud.com Stack
Version: %{_ver} Version: %{_ver}
#http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages #http://fedoraproject.org/wiki/PackageNamingGuidelines#Pre-Release_packages
%if "%{?_prerelease}" != "" %if "%{?_prerelease}" != ""
Release: 0.%{_build_number}%{_prerelease}%{dist} Release: 0.%{_build_number}%{dist}
%else %else
Release: %{_rel}%{dist} Release: %{_rel}%{dist}
%endif %endif

14
wscript
View File

@ -443,6 +443,10 @@ def set_options(opt):
help = 'package version', help = 'package version',
default = '', default = '',
dest = 'VERNUM') dest = 'VERNUM')
rpmopts.add_option('--release-version',
help = 'release version',
default = '',
dest = 'RELEASENUM')
rpmopts.add_option('--prerelease', rpmopts.add_option('--prerelease',
help = 'Branch name to append to the release number (if specified, alter release number to be a prerelease); this option requires --build-number=X [Default: nothing]', help = 'Branch name to append to the release number (if specified, alter release number to be a prerelease); this option requires --build-number=X [Default: nothing]',
default = '', default = '',
@ -587,6 +591,12 @@ def rpm(context):
prerelease = ["--define","_prerelease %s"%Options.options.PRERELEASE] prerelease = ["--define","_prerelease %s"%Options.options.PRERELEASE]
else: prerelease = [] else: prerelease = []
if Options.options.RELEASENUM:
release = Options.options.RELEASENUM
else: release = "1"
releasever = ["--define", "_rel %s" % release]
if Options.options.VERNUM: if Options.options.VERNUM:
ver = Options.options.VERNUM ver = Options.options.VERNUM
else: ver = "2.2" else: ver = "2.2"
@ -606,8 +616,8 @@ def rpm(context):
shutil.move(tarball,_join(sourcedir,tarball)) shutil.move(tarball,_join(sourcedir,tarball))
specfile = "%s.spec"%APPNAME specfile = "%s.spec"%APPNAME
checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]+packagever) checkdeps = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"--nobuild",specfile]+packagever+releasever)
dorpm = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"-bb",specfile]+buildnumber+prerelease+packagever) dorpm = lambda: c(["rpmbuild","--define","_topdir %s"%outputdir,"-bb",specfile]+buildnumber+prerelease+packagever+releasever)
try: checkdeps() try: checkdeps()
except (CalledProcessError,OSError),e: except (CalledProcessError,OSError),e:
Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...") Utils.pprint("YELLOW","Dependencies might be missing. Trying to auto-install them...")