Bug 1351482 - Use NSIS 3.01 for buildbot jobs. r?mshal
MozReview-Commit-ID: ElKlo6QwKmR
--- a/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_builds.py
@@ -63,17 +63,17 @@ config = {
'publish_nightly_en_US_routes': True,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_64_builds.py
@@ -61,17 +61,17 @@ config = {
'platform': 'win64',
'stage_platform': 'win64',
'publish_nightly_en_US_routes': True,
'env': {
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PDBSTR_PATH': '/c/Program Files (x86)/Windows Kits/8.0/Debuggers/x64/srcsrv/pdbstr.exe',
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_add-on-devel.py
@@ -19,17 +19,17 @@ config = {
#### 32 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_debug.py
@@ -21,17 +21,17 @@ config = {
#### 32 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/32_stat_and_debug.py
@@ -25,17 +25,17 @@ clang.manifest",
#### 32 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0a2;C:/mozilla-build/nsis-2.46u;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_add-on-devel.py
@@ -18,17 +18,17 @@ config = {
'enable_talos_sendchange': False,
#### 64 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_AUTOMATION': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
+++ b/testing/mozharness/configs/builds/releng_sub_windows_configs/64_debug.py
@@ -20,17 +20,17 @@ config = {
'enable_talos_sendchange': False,
#### 64 bit build specific #####
'env': {
'BINSCOPE': 'C:/Program Files (x86)/Microsoft/SDL BinScope/BinScope.exe',
'HG_SHARE_BASE_DIR': 'C:/builds/hg-shared',
'MOZ_AUTOMATION': '1',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'MOZ_OBJDIR': 'obj-firefox',
- 'PATH': 'C:/mozilla-build/nsis-3.0b1;C:/mozilla-build/python27;'
+ 'PATH': 'C:/mozilla-build/nsis-3.01;C:/mozilla-build/python27;'
'C:/mozilla-build/buildbotve/scripts;'
'%s' % (os.environ.get('path')),
'PROPERTIES_FILE': os.path.join(os.getcwd(), 'buildprops.json'),
'TINDERBOX_OUTPUT': '1',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
--- a/testing/mozharness/configs/single_locale/win32.py
+++ b/testing/mozharness/configs/single_locale/win32.py
@@ -9,17 +9,17 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-l10n",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "PATH": 'C:\\mozilla-build\\nsis-3.0b1;'
+ "PATH": 'C:\\mozilla-build\\nsis-3.01;'
'%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",
--- a/testing/mozharness/configs/single_locale/win64.py
+++ b/testing/mozharness/configs/single_locale/win64.py
@@ -9,17 +9,17 @@ config = {
"bootstrap_env": {
"MOZ_OBJDIR": "obj-l10n",
"EN_US_BINARY_URL": "%(en_us_binary_url)s",
"MOZ_UPDATE_CHANNEL": "%(update_channel)s",
"DIST": "%(abs_objdir)s",
"LOCALE_MERGEDIR": "%(abs_merge_dir)s",
"L10NBASEDIR": "../../l10n",
"MOZ_MAKE_COMPLETE_MAR": "1",
- "PATH": 'C:\\mozilla-build\\nsis-3.0b1;'
+ "PATH": 'C:\\mozilla-build\\nsis-3.01;'
'%s' % (os.environ.get('path')),
'TOOLTOOL_CACHE': 'c:/builds/tooltool_cache',
'TOOLTOOL_HOME': '/c/builds',
},
"ssh_key_dir": "~/.ssh",
"log_name": "single_locale",
"objdir": "obj-l10n",
"js_src_dir": "js/src",