зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1365722 - Rename 7z_exe_* to exe_7z_*; r=cmanchester+432261
Python can run these files with 'python -m 7z_exe_foo', but using 'import 7z_exe_foo' is not allowed because the module begins with a number. See also: https://stackoverflow.com/a/17487228 MozReview-Commit-ID: 97iDdXlZJ1a --HG-- rename : python/mozbuild/mozbuild/action/7z_exe_archive.py => python/mozbuild/mozbuild/action/exe_7z_archive.py rename : python/mozbuild/mozbuild/action/7z_exe_extract.py => python/mozbuild/mozbuild/action/exe_7z_extract.py extra : rebase_source : 1941986a7e6e56305b742710c73b90a3f7b5226b
This commit is contained in:
Родитель
5f837f5c24
Коммит
af5d946f11
|
@ -24,7 +24,7 @@ def archive_exe(pkg_dir, tagfile, sfx_package, package):
|
|||
|
||||
def main(args):
|
||||
if len(args) != 4:
|
||||
print('Usage: 7z_exe_archive.py <pkg_dir> <tagfile> <sfx_package> <package>',
|
||||
print('Usage: exe_7z_archive.py <pkg_dir> <tagfile> <sfx_package> <package>',
|
||||
file=sys.stderr)
|
||||
return 1
|
||||
else:
|
|
@ -14,7 +14,7 @@ def extract_exe(package, target):
|
|||
|
||||
def main(args):
|
||||
if len(args) != 2:
|
||||
print('Usage: 7z_exe_extract.py <package> <target>',
|
||||
print('Usage: exe_7z_extract.py <package> <target>',
|
||||
file=sys.stderr)
|
||||
return 1
|
||||
else:
|
|
@ -127,8 +127,8 @@ endif
|
|||
|
||||
ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
|
||||
PKG_SUFFIX = .exe
|
||||
INNER_MAKE_PACKAGE = $(call py_action,7z_exe_archive,'$(MOZ_PKG_DIR)' '$(MOZ_INSTALLER_PATH)/app.tag' '$(MOZ_SFX_PACKAGE)' '$(PACKAGE)')
|
||||
INNER_UNMAKE_PACKAGE = $(call py_action,7z_exe_extract,$(UNPACKAGE) $(MOZ_PKG_DIR))
|
||||
INNER_MAKE_PACKAGE = $(call py_action,exe_7z_archive,'$(MOZ_PKG_DIR)' '$(MOZ_INSTALLER_PATH)/app.tag' '$(MOZ_SFX_PACKAGE)' '$(PACKAGE)')
|
||||
INNER_UNMAKE_PACKAGE = $(call py_action,exe_7z_extract,$(UNPACKAGE) $(MOZ_PKG_DIR))
|
||||
endif
|
||||
|
||||
#Create an RPM file
|
||||
|
|
Загрузка…
Ссылка в новой задаче