Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 09:45:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1452179: [mozharness] Don't special case the path to mozinstall on windows; r=whimboo

Browse Source 
New versions of pip don't install entrypoint scripts with a `-script.py` on
windows. Instead, just call the bare script name everywhere. On unix-like
systems, this uses the shebang; on Windows, this executes the `.exe` wrapper.

Differential Revision: https://phabricator.services.mozilla.com/D967

--HG--
extra : rebase_source : 16e7bcd9efc2376f9a948f948bc81fd6596486d0
extra : source : 891a59eaf8e5e8267154d1d3872322705efd8e1a
This commit is contained in:
Tom Prince 2018-04-16 01:23:04 -06:00
parent 2e1e0ecda7
commit 482078d154
13 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/mozharness/configs/awsy/taskcluster_windows_config.py
View File

@ -11,7 +11,6 @@ config = {
"virtualenv_path": 'venv',
"exes": {
'python': sys.executable,
'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
},
"find_links": [

1
testing/mozharness/configs/firefox_ui_tests/taskcluster_windows.py
View File

@ -8,7 +8,6 @@ config = {
"virtualenv_path": 'venv',
"exes": {
'python': sys.executable,
'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
},

2
testing/mozharness/configs/marionette/windows_config.py
View File

@ -10,8 +10,6 @@ config = {
"exes": {
'python': 'c:/mozilla-build/python27/python',
'hg': 'c:/mozilla-build/hg/hg',
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
},
"find_links": [

1
testing/mozharness/configs/marionette/windows_taskcluster_config.py
View File

@ -10,7 +10,6 @@ config = {
"virtualenv_path": 'venv',
"exes": {
'python': sys.executable,
'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
},

2
testing/mozharness/configs/talos/windows_config.py
View File

@ -19,8 +19,6 @@ config = {
"virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
'tooltool.py': [PYTHON, os.path.join(os.environ['MOZILLABUILD'], 'tooltool.py')],
},

2
testing/mozharness/configs/talos/windows_taskcluster_config.py
View File

@ -18,8 +18,6 @@ config = {
"virtualenv_modules": ['pypiwin32', 'talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
},
"title": socket.gethostname().split('.')[0],

2
testing/mozharness/configs/talos/windows_vm_config.py
View File

@ -19,8 +19,6 @@ config = {
"virtualenv_modules": ['pywin32', 'talos', 'mozinstall'],
"exes": {
'python': PYTHON,
'mozinstall': ['%s/scripts/python' % VENV_PATH,
'%s/scripts/mozinstall-script.py' % VENV_PATH],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg'),
},
"title": socket.gethostname().split('.')[0],

1
testing/mozharness/configs/unittests/win_taskcluster_unittest.py
View File

@ -24,7 +24,6 @@ TASKBAR_AUTOHIDE_REG_PATH = {
config = {
"exes": {
'python': sys.executable,
'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
},
###

2
testing/mozharness/configs/unittests/win_unittest.py
View File

@ -15,8 +15,6 @@ config = {
"exes": {
'python': sys.executable,
'hg': 'c:/mozilla-build/hg/hg',
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
},
###
"installer_path": INSTALLER_PATH,

2
testing/mozharness/configs/web_platform_tests/prod_config_windows.py
View File

@ -23,8 +23,6 @@ config = {
"exes": {
'python': sys.executable,
'hg': 'c:/mozilla-build/hg/hg',
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
},
"find_links": [

1
testing/mozharness/configs/web_platform_tests/prod_config_windows_taskcluster.py
View File

@ -22,7 +22,6 @@ config = {
"exes": {
'python': sys.executable,
'mozinstall': ['build/venv/scripts/python', 'build/venv/scripts/mozinstall-script.py'],
'hg': os.path.join(os.environ['PROGRAMFILES'], 'Mercurial', 'hg')
},

3
testing/mozharness/configs/web_platform_tests/test_config_windows.py
View File

@ -4,7 +4,6 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.
# ***** END LICENSE BLOCK *****
import os
import sys
config = {
@ -21,8 +20,6 @@ config = {
"exes": {
'python': sys.executable,
'hg': 'c:/mozilla-build/hg/hg',
'mozinstall': ['%s/build/venv/scripts/python' % os.getcwd(),
'%s/build/venv/scripts/mozinstall-script.py' % os.getcwd()],
},
"default_actions": [

2
testing/mozharness/mozharness/mozilla/testing/testbase.py
View File

@ -590,7 +590,7 @@ Did you run with --create-virtualenv? Is mozinstall in virtualenv_modules?""")
def install_app(self, app=None, target_dir=None, installer_path=None):
""" Dependent on mozinstall """
# install the application
cmd = self.query_exe("mozinstall", default=self.query_python_path("mozinstall"), return_type="list")
cmd = [self.query_python_path("mozinstall")]
if app:
cmd.extend(['--app', app])
# Remove the below when we no longer need to support mozinstall 0.3