MarkAHershberger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/59158
Change subject: * Diff without whitespace * Create a core-only (no extensions)
tarball
......................................................................
* Diff without whitespace
* Create a core-only (no extensions) tarball
Change-Id: I880558546999af92dcff797c0dc40e694d20a83c
---
M make-release/make-release
1 file changed, 29 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release
refs/changes/58/59158/1
diff --git a/make-release/make-release b/make-release/make-release
index 032fbe8..85c95c6 100755
--- a/make-release/make-release
+++ b/make-release/make-release
@@ -203,7 +203,7 @@
def makePatch(patchFileName, dir1, dir2, type):
patchFile = open(patchFileName, 'w')
- args = ['diff', '-Nru']
+ args = ['diff', '-Nruw']
if type == 'i18n':
print "Generating i18n patch file..."
dir1 += '/languages/messages'
@@ -259,6 +259,27 @@
return extensions
+def makeTarFile(package, file, dir, rootDir, argAdd = []):
+ # Generate the .tar.gz file
+ outFile = open(dir + '/' + file + '.tar.gz', 'w')
+ args = ['tar', '--exclude-vcs', '--exclude-from', rootDir +
'/tarignore']
+ args += argAdd
+ args += ['-c', package]
+ print ' '.join(args)
+ exit
+ tarProc = subprocess.Popen(args, stdout = subprocess.PIPE)
+ gzipProc = subprocess.Popen(['gzip', '-9'],
+ stdin = tarProc.stdout, stdout = outFile)
+
+ if tarProc.wait() != 0 or gzipProc.wait() != 0:
+ print "tar/gzip failed, exiting"
+ sys.exit(1)
+ outFile.close()
+ targz = file + '.tar.gz'
+ print targz + ' written'
+ return targz
+
+
def makeRelease(version, branch, dir, gitRoot, prevVersion = None, prevBranch
= None):
if not os.path.exists('build'):
os.mkdir('build')
@@ -279,24 +300,16 @@
for patch in patchRevisions:
patchExport(patch, package, gitRoot)
+ extExclude = []
for ext in getVersionExtensions(version):
exportExtension(branch, ext, package, gitRoot)
+ extExclude.append( "--exclude" )
+ extExclude.append( "extensions/" + ext )
- # Generate the .tar.gz file
- outFile = open(dir + '/' + package + '.tar.gz', 'w')
- print os.getcwd()
- args = ['tar', '--exclude-vcs', '--exclude-from', rootDir +
'/tarignore', '-c', package]
- print ' '.join(args)
- tarProc = subprocess.Popen(args, stdout = subprocess.PIPE)
- gzipProc = subprocess.Popen(['gzip', '-9'],
- stdin = tarProc.stdout, stdout = outFile)
-
- if tarProc.wait() != 0 or gzipProc.wait() != 0:
- print "tar/gzip failed, exiting"
- sys.exit(1)
- outFile.close()
- outFiles = [package + '.tar.gz']
- print package + '.tar.gz written'
+ # Generate the .tar.gz files
+ outFiles = []
+ outFiles.append( makeTarFile( package, 'mediawiki-core-' + version,
dir, rootDir, extExclude ) )
+ outFiles.append( makeTarFile( package, package, dir, rootDir ) )
# Patch
if prevVersion != None:
--
To view, visit https://gerrit.wikimedia.org/r/59158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I880558546999af92dcff797c0dc40e694d20a83c
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
