[Pkg-mozext-commits] [adblock-plus] 304/464: More consistent names for the architecture-specific packager and releaseAutomation libraries
David Prévot
taffit at moszumanska.debian.org
Tue Jul 22 20:44:28 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 ec09948ecf216680fdf19878684453d929467f08
Author: Wladimir Palant <trev at adblockplus.org>
Date: Thu Oct 18 09:01:42 2012 +0200
More consistent names for the architecture-specific packager and releaseAutomation libraries
--HG--
rename : packager.py => packagerGecko.py
rename : releaseAutomation.py => releaseAutomationGecko.py
---
build.py | 24 ++++++-------
packager.py => packagerGecko.py | 0
packagerKMeleon.py | 42 +++++++++++------------
releaseAutomation.py => releaseAutomationGecko.py | 2 +-
releaseAutomationKMeleon.py | 12 +++----
5 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/build.py b/build.py
index cde89e7..7a25786 100644
--- a/build.py
+++ b/build.py
@@ -163,14 +163,14 @@ def runBuild(baseDir, scriptName, opts, args, type):
outFile = args[0] if len(args) > 0 else None
if type == 'gecko':
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
packager.createBuild(baseDir, outFile=outFile, locales=locales, buildNum=buildNum,
releaseBuild=releaseBuild, keyFile=keyFile,
limitMetadata=limitMetadata, multicompartment=multicompartment)
elif type == 'kmeleon':
- import buildtools.packagerKMeleon as packagerKMeleon
- packagerKMeleon.createBuild(baseDir, outFile=outFile, locales=locales,
- buildNum=buildNum, releaseBuild=releaseBuild)
+ import buildtools.packagerKMeleon as packager
+ packager.createBuild(baseDir, outFile=outFile, locales=locales,
+ buildNum=buildNum, releaseBuild=releaseBuild)
def runAutoInstall(baseDir, scriptName, opts, args, type):
if len(args) == 0:
@@ -188,7 +188,7 @@ def runAutoInstall(baseDir, scriptName, opts, args, type):
else:
host, port = ('localhost', args[0])
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
packager.autoInstall(baseDir, host, port, multicompartment=multicompartment)
@@ -200,7 +200,7 @@ def setupTranslations(baseDir, scriptName, opts, args, type):
key = args[0]
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
locales = packager.getLocales(baseDir, True)
basename = packager.readMetadata(baseDir).get('general', 'baseName')
@@ -216,7 +216,7 @@ def updateTranslationMaster(baseDir, scriptName, opts, args, type):
key = args[0]
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
defaultLocaleDir = os.path.join(packager.getLocalesDir(baseDir), packager.defaultLocale)
basename = packager.readMetadata(baseDir).get('general', 'baseName')
@@ -231,7 +231,7 @@ def getTranslations(baseDir, scriptName, opts, args, type):
return
key = args[0]
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
localesDir = packager.getLocalesDir(baseDir)
basename = packager.readMetadata(baseDir).get('general', 'baseName')
@@ -245,7 +245,7 @@ def showDescriptions(baseDir, scriptName, opts, args, type):
if option in ('-l', '--locales'):
locales = value.split(',')
- import buildtools.packager as packager
+ import buildtools.packagerGecko as packager
if locales == None:
locales = packager.getLocales(baseDir)
elif locales == 'all':
@@ -322,11 +322,11 @@ def runReleaseAutomation(baseDir, scriptName, opts, args, type):
if keyFile == None:
print 'Warning: no key file specified, creating an unsigned release build\n'
- import buildtools.releaseAutomation as releaseAutomation
+ import buildtools.releaseAutomationGecko as releaseAutomation
releaseAutomation.run(baseDir, version, keyFile, downloadsRepo, buildtoolsRepo)
else:
- import buildtools.releaseAutomationKMeleon as releaseAutomationKMeleon
- releaseAutomationKMeleon.run(baseDir, downloadsRepo, buildtoolsRepo)
+ import buildtools.releaseAutomationKMeleon as releaseAutomation
+ releaseAutomation.run(baseDir, downloadsRepo, buildtoolsRepo)
with addCommand(lambda baseDir, scriptName, opts, args, type: usage(scriptName, type), ('help', '-h', '--help')) as command:
command.shortDescription = 'Show this message'
diff --git a/packager.py b/packagerGecko.py
similarity index 100%
rename from packager.py
rename to packagerGecko.py
diff --git a/packagerKMeleon.py b/packagerKMeleon.py
index 9f8bad9..c5a60a0 100644
--- a/packagerKMeleon.py
+++ b/packagerKMeleon.py
@@ -5,7 +5,7 @@
# http://mozilla.org/MPL/2.0/.
import os, subprocess, re, tempfile, shutil, json
-import buildtools.packager as packager
+import buildtools.packagerGecko as packagerBase
libs = (
'libcmt.lib', 'kernel32.lib', 'user32.lib', 'gdi32.lib', 'comctl32.lib',
@@ -92,15 +92,15 @@ def buildDLL(baseDir, fileName, version):
shutil.rmtree(tempDir, ignore_errors=True)
def createManifest(baseExtDir, params):
- localeMetadata = packager.readLocaleMetadata(baseExtDir, params['locales'])
+ localeMetadata = packagerBase.readLocaleMetadata(baseExtDir, params['locales'])
manifest = {}
metadata = params['metadata']
manifest['id'] = metadata.get('general', 'id')
manifest['version'] = metadata.get('general', 'version')
manifest['version'] = params['version']
- manifest['name'] = localeMetadata[packager.defaultLocale]['name']
- manifest['description'] = localeMetadata[packager.defaultLocale]['description']
+ manifest['name'] = localeMetadata[packagerBase.defaultLocale]['name']
+ manifest['description'] = localeMetadata[packagerBase.defaultLocale]['description']
manifest['creator'] = metadata.get('general', 'author')
manifest['homepage'] = metadata.get('homepage', 'default')
if metadata.has_section('contributors'):
@@ -108,7 +108,7 @@ def createManifest(baseExtDir, params):
manifest['contributors'].sort()
else:
manifest['contributors'] = []
- manifest['translators'] = packager.getTranslators(localeMetadata)
+ manifest['translators'] = packagerBase.getTranslators(localeMetadata)
return 'var EXPORTED_SYMBOLS = ["manifest"];\nvar manifest = ' + json.dumps(manifest)
def processChromeManifest(data, baseName):
@@ -120,15 +120,15 @@ def processChromeManifest(data, baseName):
def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild=False):
if buildNum == None:
- buildNum = packager.getBuildNum(baseDir)
+ buildNum = packagerBase.getBuildNum(baseDir)
baseExtDir = getBaseExtensionDir(baseDir)
if locales == None:
- locales = packager.getLocales(baseExtDir)
+ locales = packagerBase.getLocales(baseExtDir)
elif locales == 'all':
- locales = packager.getLocales(baseExtDir, True)
+ locales = packagerBase.getLocales(baseExtDir, True)
- metadata = packager.readMetadata(baseExtDir)
+ metadata = packagerBase.readMetadata(baseExtDir)
version = metadata.get('general', 'version')
if not releaseBuild:
version += '.' + buildNum
@@ -145,27 +145,27 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
chromeFiles = {}
for xulFile in getXULFiles(baseDir):
- packager.readFile(chromeFiles, params, xulFile, 'content/ui/%s' % os.path.basename(xulFile))
+ packagerBase.readFile(chromeFiles, params, xulFile, 'content/ui/%s' % os.path.basename(xulFile))
files = {}
files['modules/%s/Manifest.jsm' % baseName] = createManifest(baseExtDir, params)
files['kplugins/%s.dll' % baseName] = buildDLL(baseDir, '%s.dll' % baseName, version)
- files['chrome/%s.jar' % baseName] = packager.createChromeJar(baseExtDir, params, files=chromeFiles)
+ files['chrome/%s.jar' % baseName] = packagerBase.createChromeJar(baseExtDir, params, files=chromeFiles)
- packager.readFile(files, params, os.path.join(baseExtDir, 'chrome.manifest'), 'chrome/%s.manifest' % baseName)
+ packagerBase.readFile(files, params, os.path.join(baseExtDir, 'chrome.manifest'), 'chrome/%s.manifest' % baseName)
files['chrome/%s.manifest' % baseName] = processChromeManifest(files['chrome/%s.manifest' % baseName], baseName)
for macroFile in getMacroFiles(baseDir):
- packager.readFile(files, params, macroFile, 'macros/%s' % os.path.basename(macroFile))
+ packagerBase.readFile(files, params, macroFile, 'macros/%s' % os.path.basename(macroFile))
for interfaceFile in getInterfaceFiles(baseDir):
- packager.readFile(files, params, interfaceFile, 'components/%s' % os.path.basename(interfaceFile))
+ packagerBase.readFile(files, params, interfaceFile, 'components/%s' % os.path.basename(interfaceFile))
for moduleFile in getModuleFiles(baseDir):
- packager.readFile(files, params, moduleFile, 'modules/%s/%s' % (baseName, os.path.basename(moduleFile)))
+ packagerBase.readFile(files, params, moduleFile, 'modules/%s/%s' % (baseName, os.path.basename(moduleFile)))
for prefsFile in getPrefsFiles(baseDir):
- packager.readFile(files, params, prefsFile, 'defaults/pref/%s' % os.path.basename(prefsFile))
+ packagerBase.readFile(files, params, prefsFile, 'defaults/pref/%s' % os.path.basename(prefsFile))
- packager.readFile(files, params, os.path.join(baseExtDir, 'defaults'), 'defaults')
- packager.readFile(files, params, os.path.join(baseExtDir, 'modules'), 'modules/%s' %baseName)
+ packagerBase.readFile(files, params, os.path.join(baseExtDir, 'defaults'), 'defaults')
+ packagerBase.readFile(files, params, os.path.join(baseExtDir, 'modules'), 'modules/%s' %baseName)
# Correct files names (defaults/preferences/ => defaults/pref/)
newFiles = {}
@@ -176,8 +176,8 @@ def createBuild(baseDir, outFile=None, locales=None, buildNum=None, releaseBuild
files = newFiles
# Allow local metadata to overrite settings from base extension
- metadata.read(packager.getMetadataPath(baseDir))
+ metadata.read(packagerBase.getMetadataPath(baseDir))
if outFile == None:
- outFile = packager.getDefaultFileName(baseDir, metadata, version, 'zip')
+ outFile = packagerBase.getDefaultFileName(baseDir, metadata, version, 'zip')
- packager.writeXPI(files, outFile)
+ packagerBase.writeXPI(files, outFile)
diff --git a/releaseAutomation.py b/releaseAutomationGecko.py
similarity index 98%
rename from releaseAutomation.py
rename to releaseAutomationGecko.py
index 380ef98..756d5d3 100644
--- a/releaseAutomation.py
+++ b/releaseAutomationGecko.py
@@ -6,7 +6,7 @@
import os, re, subprocess, tarfile
from StringIO import StringIO
-import buildtools.packager as packager
+import buildtools.packagerGecko as packager
def run(baseDir, version, keyFile, downloadsRepo, buildtoolsRepo):
# Replace version number in metadata file "manually", ConfigParser will mess
diff --git a/releaseAutomationKMeleon.py b/releaseAutomationKMeleon.py
index 1f12e0e..8396af3 100644
--- a/releaseAutomationKMeleon.py
+++ b/releaseAutomationKMeleon.py
@@ -6,18 +6,18 @@
import os, re, subprocess, tarfile
from StringIO import StringIO
-import buildtools.packager as packager
+import buildtools.packagerGecko as packagerBase
import buildtools.packagerKMeleon as packagerKMeleon
def run(baseDir, downloadsRepo, buildtoolsRepo):
baseExtDir = packagerKMeleon.getBaseExtensionDir(baseDir)
# Read extension name, version and branch name
- locales = packager.readLocaleMetadata(baseExtDir, [packager.defaultLocale])
- extensionName = locales[packager.defaultLocale]['name'] + ' for K-Meleon'
+ locales = packagerBase.readLocaleMetadata(baseExtDir, [packagerBase.defaultLocale])
+ extensionName = locales[packagerBase.defaultLocale]['name'] + ' for K-Meleon'
- metadata = packager.readMetadata(baseExtDir)
- metadata.read(packager.getMetadataPath(baseDir))
+ metadata = packagerBase.readMetadata(baseExtDir)
+ metadata.read(packagerBase.getMetadataPath(baseDir))
branchName = metadata.get('general', 'branchname')
version = metadata.get('general', 'version')
@@ -25,7 +25,7 @@ def run(baseDir, downloadsRepo, buildtoolsRepo):
subprocess.Popen(['hg', 'tag', '-R', baseDir, '-f', version]).communicate()
# Create a release build
- buildPath = os.path.join(downloadsRepo, packager.getDefaultFileName(baseDir, metadata, version, 'zip'))
+ buildPath = os.path.join(downloadsRepo, packagerBase.getDefaultFileName(baseDir, metadata, version, 'zip'))
packagerKMeleon.createBuild(baseDir, outFile=buildPath, releaseBuild=True)
# Create source archive
--
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