MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/89413
Change subject: merge
......................................................................
merge
Change-Id: I3e35a3730823d31ba3552badc75088ac4ce0919d
---
M make-release/make-release.py
1 file changed, 30 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/13/89413/1
diff --git a/make-release/make-release.py b/make-release/make-release.py
index c576ba4..afc2d43 100755
--- a/make-release/make-release.py
+++ b/make-release/make-release.py
@@ -63,6 +63,9 @@
elif version > '1.17':
extensions += oldCoreExtensions
+ if version > '1.22':
+ extensions.remove('Vector')
+
# Return uniq elements (order not preserved)
return list(set(extensions))
@@ -238,7 +241,7 @@
noPrevious = False
if decomposed['prevVersion'] is None:
- if not self.ask("No previous release found. Do you want to make a"
+ if not self.ask("No previous release found. Do you want to make a "
"release with no patch?"):
print('Please specify the correct previous release '
'on the command line')
@@ -342,8 +345,8 @@
dir + '/extensions/' + extension, extension)
print "Done"
- def makePatch(self, patchFileName, dir1, dir2, type):
- patchFile = open(patchFileName, 'w')
+ def makePatch(self, destDir, patchFileName, dir1, dir2, type):
+ patchFile = open(destDir + "/" + patchFileName, 'w')
args = ['diff', '-Nruw']
if type == 'i18n':
print "Generating i18n patch file..."
@@ -384,7 +387,7 @@
print "Done"
return diffStatus == 1
- def makeTarFile(self, package, file, dir, argAdd=[]):
+ def makeTarFile(self, package, targetDir, dir, argAdd=[]):
tar = self.options.tar_command
tarignore = self.options.destDir + '/tarignore'
@@ -393,14 +396,13 @@
tarignore = None
# Generate the .tar.gz file
- filename = dir + '/' + file + '.tar.gz'
- outFile = open(filename, "w")
- args = [tar, '--format=gnu', '--exclude-vcs']
+ filename = package + '.tar.gz'
+ outFile = open(dir + '/' + filename, "w")
+ args = [tar, '--format=gnu', '--exclude-vcs', '-C', dir]
if tarignore:
args += ['--exclude-from', tarignore]
args += argAdd
- args += ['-c', package]
-
+ args += ['-c', targetDir]
print "Creating " + filename
tarProc = subprocess.Popen(args, stdout=subprocess.PIPE)
gzipProc = subprocess.Popen(['gzip', '-9'], stdin=tarProc.stdout,
@@ -410,9 +412,8 @@
print "tar/gzip failed, exiting"
sys.exit(1)
outFile.close()
- targz = file + '.tar.gz'
- print targz + ' written'
- return targz
+ print filename + ' written'
+ return filename
def makeRelease(self, version, branch, dir, prevVersion=None,
prevBranch=None, extensions=[]):
@@ -459,10 +460,18 @@
# Generate the .tar.gz files
outFiles = []
outFiles.append(
- self.makeTarFile(package, 'mediawiki-core-' + version, dir,
- extExclude))
+ self.makeTarFile(
+ package='mediawiki-core-' + version,
+ targetDir=package,
+ dir=buildDir,
+ argAdd=extExclude)
+ )
outFiles.append(
- self.makeTarFile(package, package, dir))
+ self.makeTarFile(
+ package=package,
+ targetDir=package,
+ dir=buildDir)
+ )
# Patch
if prevVersion is not None:
@@ -473,14 +482,14 @@
self.exportExtension(branch, ext, prevDir)
self.makePatch(
- dir + '/' + package + '.patch.gz', prevDir, package, 'normal')
+ buildDir, package + '.patch.gz', prevDir, package, 'normal')
outFiles.append(package + '.patch.gz')
print package + '.patch.gz written'
haveI18n = False
if os.path.exists(package + '/languages/messages'):
i18nPatch = 'mediawiki-i18n-' + version + '.patch.gz'
if (self.makePatch(
- dir + '/' + i18nPatch, prevDir, package, 'i18n')):
+ buildDir, i18nPatch, prevDir, package, 'i18n')):
outFiles.append(i18nPatch)
print i18nPatch + ' written'
haveI18n = True
@@ -499,12 +508,13 @@
if proc.wait() != 0:
print "gpg failed, exiting"
sys.exit(1)
- uploadFiles.append(dir + '/' + fileName + '.sig')
- uploadFiles.append(dir + '/' + fileName)
+ uploadFiles.append(fileName + '.sig')
+ uploadFiles.append(fileName)
# Generate upload tarball
tar = self.options.tar_command
- args = [tar, 'cf', uploadDir + '/upload-' + version + '.tar']
+ args = [tar, '-C', buildDir,
+ '-cf', uploadDir + '/upload-' + version + '.tar']
args.extend(uploadFiles)
proc = subprocess.Popen(args)
if proc.wait() != 0:
--
To view, visit https://gerrit.wikimedia.org/r/89413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e35a3730823d31ba3552badc75088ac4ce0919d
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
