MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81270
Change subject: update param names and usage message.
......................................................................
update param names and usage message.
Change-Id: I7cb3f8368c628b490cbf87a1961e8449c28a914c
---
M make-release/make-release
1 file changed, 23 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/70/81270/1
diff --git a/make-release/make-release b/make-release/make-release
index 302c54c..bbc31ae 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -14,7 +14,7 @@
print """
Usage:
./make-release --snapshot
- ./make-release [--help] [--snapshot] [--git-root = URL] [--smw] [--mw-root =
DIR] [--mw-branch = BRANCH] [--yes] [--no-previous] <next-version>
[<previous-version>]
+ ./make-release [--help] [--yes] [--no-previous] [--snapshot] [--smw]
[--git-root = URL] [--mw-root = DIR] [--mw-branch = BRANCH] <next-version>
[<previous-version>]
Example:
./make-release 1.19.0
@@ -23,14 +23,21 @@
and you will be prompted to confirm that the version number is correct. To
always answer "yes", use the --yes option.
-Use --no-previous to disable the diff to previous entirely.
+ --help this message
+ --no-previous disable the diff to previous entirely
+ --yes answer yes to any question
+ --snapshot build an unversioned snapshot
+ --smw include the Semantic MW bundle
+ --git-root=URL the root of the multi-repo to use (defaults to gerrit)
+ --build-root=DIR where the build should happen (defaults to pwd)
+ --mw-branch=NAME which branch to use (defaults to trunk for snapshot)
"""
sys.exit(1)
def main():
try:
- options, args = getopt.getopt(sys.argv[1:], '', ['help', 'snapshot',
'yes', 'no-previous', 'git-root = ', 'smw', 'mw-root = ', 'mw-branch = '])
+ options, args = getopt.getopt(sys.argv[1:], '', ['help', 'snapshot',
'yes', 'no-previous', 'git-root=', 'smw', 'build-root=', 'mw-branch='])
except getopt.GetoptError, err:
print str(err)
dieUsage()
@@ -62,7 +69,7 @@
gitRoot = value
elif name == '--smw':
smw = True
- elif name == '--mw-root':
+ elif name == '--build-root':
mwRootDir = value
elif name == '--mw-branch':
mwBranch = value
@@ -88,7 +95,10 @@
sys.exit(1)
if mwRootDir is None:
- mwRootDir = decomposed['major']
+ mwRootDir = os.getcwd()
+
+ if mwDir is None:
+ mwDir = decomposed['major']
if mwBranch is None:
mwBranch = decomposed['branch']
@@ -106,7 +116,8 @@
prevVersion=args[1],
prevBranch=versionToBranch(args[1]),
branch=mwBranch,
- dir=mwRootDir,
+ dir=mwDir,
+ rootDir=mwRootDir,
gitRoot=gitRoot)
return
@@ -122,7 +133,8 @@
extensions=extensions,
version=version,
branch=mwBranch,
- dir=mwRootDir,
+ dir=mwDir,
+ rootDir=mwRootDir,
gitRoot=gitRoot)
else:
if not yes and not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
@@ -135,7 +147,7 @@
prevVersion=decomposed['prevVersion'],
prevBranch=decomposed['prevBranch'],
branch=mwBranch,
- dir=mwRootDir,
+ dir=nmwRootDir,
gitRoot=gitRoot)
@@ -323,12 +335,13 @@
return targz
-def makeRelease(version, branch, dir, gitRoot, prevVersion=None,
prevBranch=None, extensions=[]):
+def makeRelease(version, branch, dir, gitRoot, prevVersion=None,
prevBranch=None, extensions=[], rootDir=None):
if not os.path.exists('build'):
os.mkdir('build')
if not os.path.exists('uploads'):
os.mkdir('uploads')
- rootDir = os.getcwd()
+ if rootDir is None:
+ rootDir = os.getcwd()
os.chdir('build')
if not os.path.exists(dir):
--
To view, visit https://gerrit.wikimedia.org/r/81270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cb3f8368c628b490cbf87a1961e8449c28a914c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <mhershber...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
