MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/56883
Change subject: Move extension generation so that diffs work better
......................................................................
Move extension generation so that diffs work better
Change-Id: Iadeb4f65c5a6e9ffac16c57941dcd269fcafb592
---
M make-release/make-release
1 file changed, 36 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/83/56883/1
diff --git a/make-release/make-release b/make-release/make-release
index 29d201d..032fbe8 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -26,10 +26,6 @@
print str(err)
dieUsage()
- extensions = []
- coreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'PdfHandler', 'Renameuser',
- 'SpamBlacklist', 'Vector', 'WikiEditor']
- oldCoreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke',
'ParserFunctions', 'Renameuser', 'Vector', 'WikiEditor']
snapshot = False
yes = False
noPrevious = False
@@ -52,8 +48,7 @@
version = 'snapshot-' + time.strftime('%Y%m%d',
time.gmtime()),
branch = 'trunk',
dir = 'snapshots',
- gitRoot = gitRoot,
- extensions = coreExtensions)
+ gitRoot = gitRoot)
return
# Need a version specified if not snapshot
@@ -66,13 +61,6 @@
sys.exit(1)
version = decomposed['major']
- # Export extensions for inclusion
- if version > '1.20':
- extensions = coreExtensions
- elif version > '1.17':
- extensions = oldCoreExtensions
- else:
- extensions = []
if len(args) >= 2:
# Given the previous version on the command line
@@ -82,8 +70,7 @@
prevBranch = versionToBranch(args[1]),
branch = decomposed['branch'],
dir = decomposed['major'],
- gitRoot = gitRoot,
- extensions = extensions)
+ gitRoot = gitRoot)
return
if decomposed['prevVersion'] == None:
@@ -98,8 +85,7 @@
version = args[0],
branch = decomposed['branch'],
dir = decomposed['major'],
- gitRoot = gitRoot,
- extensions = extensions)
+ gitRoot = gitRoot)
else:
if not ask("Was %s the previous release?" %
(decomposed['prevVersion'])):
print 'Please specify the correct previous release on
the command line'
@@ -111,8 +97,7 @@
prevBranch = decomposed['prevBranch'],
branch = decomposed['branch'],
dir = decomposed['major'],
- gitRoot = gitRoot,
- extensions = extensions )
+ gitRoot = gitRoot)
def ask(question):
while True:
@@ -246,7 +231,35 @@
print "Done"
return diffStatus == 1
-def makeRelease(version, branch, dir, gitRoot, prevVersion = None, prevBranch
= None, extensions = []):
+def getVersionExtensions(version):
+ extensions = []
+ coreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke', 'ParserFunctions',
'PdfHandler', 'Renameuser',
+ 'SpamBlacklist', 'Vector', 'WikiEditor' ]
+ newExtensions = ['Cite',
+ 'ImageMap',
+ 'Interwiki',
+ 'TitleBlacklist',
+ 'SpamBlacklist',
+ 'Poem',
+ 'InputBox',
+ 'LocalisationUpdate',
+ 'SyntaxHighlight_GeSHi'
+ ]
+ oldCoreExtensions = ['ConfirmEdit', 'Gadgets', 'Nuke',
'ParserFunctions', 'Renameuser', 'Vector', 'WikiEditor']
+
+ # Export extensions for inclusion
+ if version > '1.21':
+ extensions = coreExtensions + newExtensions
+ elif version > '1.20':
+ extensions = coreExtensions
+ elif version > '1.17':
+ extensions = oldCoreExtensions
+ else:
+ extensions = []
+
+ return extensions
+
+def makeRelease(version, branch, dir, gitRoot, prevVersion = None, prevBranch
= None):
if not os.path.exists('build'):
os.mkdir('build')
if not os.path.exists('uploads'):
@@ -266,8 +279,7 @@
for patch in patchRevisions:
patchExport(patch, package, gitRoot)
-
- for ext in extensions:
+ for ext in getVersionExtensions(version):
exportExtension(branch, ext, package, gitRoot)
# Generate the .tar.gz file
@@ -291,8 +303,8 @@
prevDir = 'mediawiki-' + prevVersion
export(prevBranch, prevDir, gitRoot)
- for ext in extensions:
- exportExtension(prevBranch, ext, prevDir, gitRoot)
+ for ext in getVersionExtensions(prevVersion):
+ exportExtension(branch, ext, package, gitRoot)
makePatch(dir + '/' + package + '.patch.gz', prevDir, package,
'normal')
outFiles.append(package + '.patch.gz')
--
To view, visit https://gerrit.wikimedia.org/r/56883
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadeb4f65c5a6e9ffac16c57941dcd269fcafb592
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/tools/release
Gerrit-Branch: master
Gerrit-Owner: MarkAHershberger <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
