[Pkg-mozext-commits] [adblock-plus] 393/464: Always pass build type explicitly to readMetadata/getMetadataPath (fixes "build.py -t chrome translate" command among other things)
David Prévot
taffit at moszumanska.debian.org
Tue Jul 22 20:44:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit de8993a057db37e21ccf4131fd67ea181a0426b1
Author: Wladimir Palant <trev at adblockplus.org>
Date: Wed Jul 10 11:28:42 2013 +0200
Always pass build type explicitly to readMetadata/getMetadataPath (fixes "build.py -t chrome translate" command among other things)
---
build.py | 20 ++++++++++----------
packagerGecko.py | 16 +++++-----------
releaseAutomationGecko.py | 10 +++++-----
3 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/build.py b/build.py
index 16d40b7..1f3f66a 100644
--- a/build.py
+++ b/build.py
@@ -192,7 +192,7 @@ def runBuild(baseDir, scriptName, opts, args, type):
if type == 'gecko':
import buildtools.packagerGecko as packager
- packager.createBuild(baseDir, outFile=outFile, locales=locales, buildNum=buildNum,
+ packager.createBuild(baseDir, type=type, outFile=outFile, locales=locales, buildNum=buildNum,
releaseBuild=releaseBuild, keyFile=keyFile,
multicompartment=multicompartment)
elif type == 'chrome' or type == 'opera':
@@ -219,7 +219,7 @@ def runAutoInstall(baseDir, scriptName, opts, args, type):
host, port = ('localhost', args[0])
import buildtools.packagerGecko as packager
- packager.autoInstall(baseDir, host, port, multicompartment=multicompartment)
+ packager.autoInstall(baseDir, type, host, port, multicompartment=multicompartment)
def createDevEnv(baseDir, scriptName, opts, args, type):
@@ -239,11 +239,11 @@ def setupTranslations(baseDir, scriptName, opts, args, type):
import buildtools.packagerChrome as packager
locales = os.listdir(os.path.join(baseDir, '_locales'))
locales = map(lambda locale: locale.replace('_', '-'), locales)
- basename = packager.readMetadata(baseDir).get('general', 'basename')
+ basename = packager.readMetadata(baseDir, type).get('general', 'basename')
else:
import buildtools.packagerGecko as packager
locales = packager.getLocales(baseDir, True)
- basename = packager.readMetadata(baseDir).get('general', 'basename')
+ basename = packager.readMetadata(baseDir, type).get('general', 'basename')
import buildtools.localeTools as localeTools
localeTools.setupTranslations(type, locales, basename, key)
@@ -260,12 +260,12 @@ def updateTranslationMaster(baseDir, scriptName, opts, args, type):
if type == 'chrome' or type == 'opera':
import buildtools.packagerChrome as packager
defaultLocaleDir = os.path.join(baseDir, '_locales', packager.defaultLocale)
- metadata = packager.readMetadata(baseDir)
+ metadata = packager.readMetadata(baseDir, type)
basename = metadata.get('general', 'basename')
else:
import buildtools.packagerGecko as packager
defaultLocaleDir = os.path.join(packager.getLocalesDir(baseDir), packager.defaultLocale)
- metadata = packager.readMetadata(baseDir)
+ metadata = packager.readMetadata(baseDir, type)
basename = metadata.get('general', 'basename')
import buildtools.localeTools as localeTools
@@ -285,14 +285,14 @@ def uploadTranslations(baseDir, scriptName, opts, args, type):
localesDir = os.path.join(baseDir, '_locales')
locales = os.listdir(localesDir)
locales = map(lambda locale: (locale.replace('_', '-'), os.path.join(localesDir, locale)), locales)
- metadata = packager.readMetadata(baseDir)
+ metadata = packager.readMetadata(baseDir, type)
basename = metadata.get('general', 'basename')
else:
import buildtools.packagerGecko as packager
localesDir = packager.getLocalesDir(baseDir)
locales = packager.getLocales(baseDir, True)
locales = map(lambda locale: (locale, os.path.join(localesDir, locale)), locales)
- metadata = packager.readMetadata(baseDir)
+ metadata = packager.readMetadata(baseDir, type)
basename = metadata.get('general', 'basename')
import buildtools.localeTools as localeTools
@@ -316,7 +316,7 @@ def getTranslations(baseDir, scriptName, opts, args, type):
localesDir = packager.getLocalesDir(baseDir)
import buildtools.localeTools as localeTools
- basename = packager.readMetadata(baseDir).get('general', 'basename')
+ basename = packager.readMetadata(baseDir, type).get('general', 'basename')
localeTools.getTranslations(type, localesDir, packager.defaultLocale.replace('_', '-'), basename, key)
@@ -406,7 +406,7 @@ def runReleaseAutomation(baseDir, scriptName, opts, args, type):
print 'Warning: no key file specified, creating an unsigned release build\n'
import buildtools.releaseAutomationGecko as releaseAutomation
- releaseAutomation.run(baseDir, version, keyFile, downloadsRepo)
+ releaseAutomation.run(baseDir, type, version, keyFile, downloadsRepo)
def updatePSL(baseDir, scriptName, opts, args, type):
import buildtools.publicSuffixListUpdater as publicSuffixListUpdater
diff --git a/packagerGecko.py b/packagerGecko.py
index f7d2def..0ec8cc2 100644
--- a/packagerGecko.py
+++ b/packagerGecko.py
@@ -22,7 +22,7 @@ import xml.dom.minidom as minidom
import buildtools.localeTools as localeTools
import packager
-from packager import getDefaultFileName, getBuildVersion, getTemplate, Files
+from packager import readMetadata, getMetadataPath, getDefaultFileName, getBuildVersion, getTemplate, Files
KNOWN_APPS = {
'conkeror': '{a79fe89b-6662-4ff4-8e88-09950ad4dfde}',
@@ -40,12 +40,6 @@ KNOWN_APPS = {
defaultLocale = 'en-US'
-def getMetadataPath(baseDir):
- return packager.getMetadataPath(baseDir, 'gecko')
-
-def readMetadata(baseDir):
- return packager.readMetadata(baseDir, 'gecko')
-
def getChromeDir(baseDir):
return os.path.join(baseDir, 'chrome')
@@ -296,13 +290,13 @@ def signFiles(files, keyFile):
signature.write_der(buffer)
files['META-INF/zigbert.rsa'] = buffer.read()
-def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild=False, keyFile=None, multicompartment=False):
+def createBuild(baseDir, type="gecko", outFile=None, locales=None, buildNum=None, releaseBuild=False, keyFile=None, multicompartment=False):
if locales == None:
locales = getLocales(baseDir)
elif locales == 'all':
locales = getLocales(baseDir, True)
- metadata = readMetadata(baseDir)
+ metadata = readMetadata(baseDir, type)
version = getBuildVersion(baseDir, metadata, releaseBuild, buildNum)
if outFile == None:
@@ -336,7 +330,7 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
signFiles(files, keyFile)
files.zip(outFile, sortKey=lambda x: '!' if x == 'META-INF/zigbert.rsa' else x)
-def autoInstall(baseDir, host, port, multicompartment=False):
+def autoInstall(baseDir, type, host, port, multicompartment=False):
fileBuffer = StringIO()
- createBuild(baseDir, outFile=fileBuffer, multicompartment=multicompartment)
+ createBuild(baseDir, type=type, outFile=fileBuffer, multicompartment=multicompartment)
urllib.urlopen('http://%s:%s/' % (host, port), data=fileBuffer.getvalue())
diff --git a/releaseAutomationGecko.py b/releaseAutomationGecko.py
index 00fdbfb..b44d5fd 100644
--- a/releaseAutomationGecko.py
+++ b/releaseAutomationGecko.py
@@ -19,15 +19,15 @@ import os, re, subprocess, tarfile
from StringIO import StringIO
import buildtools.packagerGecko as packager
-def run(baseDir, version, keyFile, downloadsRepo):
+def run(baseDir, type, version, keyFile, downloadsRepo):
# Replace version number in metadata file "manually", ConfigParser will mess
# up the order of lines.
- handle = open(packager.getMetadataPath(baseDir), 'rb')
+ handle = open(packager.getMetadataPath(baseDir, type), 'rb')
rawMetadata = handle.read()
handle.close()
versionRegExp = re.compile(r'^(\s*version\s*=\s*).*', re.I | re.M)
rawMetadata = re.sub(versionRegExp, r'\g<1>%s' % version, rawMetadata)
- handle = open(packager.getMetadataPath(baseDir), 'wb')
+ handle = open(packager.getMetadataPath(baseDir, type), 'wb')
handle.write(rawMetadata)
handle.close()
@@ -35,7 +35,7 @@ def run(baseDir, version, keyFile, downloadsRepo):
locales = packager.readLocaleMetadata(baseDir, [packager.defaultLocale])
extensionName = locales[packager.defaultLocale]['name']
- metadata = packager.readMetadata(baseDir)
+ metadata = packager.readMetadata(baseDir, type)
# Now commit the change and tag it
subprocess.check_call(['hg', 'commit', '-R', baseDir, '-m', 'Releasing %s %s' % (extensionName, version)])
@@ -43,7 +43,7 @@ def run(baseDir, version, keyFile, downloadsRepo):
# Create a release build
buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(baseDir, metadata, version, 'xpi'))
- packager.createBuild(baseDir, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
+ packager.createBuild(baseDir, type=type, outFile=buildPath, releaseBuild=True, keyFile=keyFile)
# Create source archive
archivePath = os.path.splitext(buildPath)[0] + '-source.tgz'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list