@nordicsemiconductor/nrf-jlink-js 0.13.0 → 0.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/shared/jLinkVersion.js +19 -1
- package/package.json +2 -1
|
@@ -4,6 +4,17 @@
|
|
|
4
4
|
*
|
|
5
5
|
* SPDX-License-Identifier: LicenseRef-Nordic-4-Clause
|
|
6
6
|
*/
|
|
7
|
+
var __assign = (this && this.__assign) || function () {
|
|
8
|
+
__assign = Object.assign || function(t) {
|
|
9
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
10
|
+
s = arguments[i];
|
|
11
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
12
|
+
t[p] = s[p];
|
|
13
|
+
}
|
|
14
|
+
return t;
|
|
15
|
+
};
|
|
16
|
+
return __assign.apply(this, arguments);
|
|
17
|
+
};
|
|
7
18
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
8
19
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
9
20
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -147,6 +158,11 @@ var isValidVersion = function (installedVersion, expectedVersion) {
|
|
|
147
158
|
return semver_1.default.gte(convertToSemverVersion(installedVersion), convertToSemverVersion(expectedVersion));
|
|
148
159
|
};
|
|
149
160
|
exports.isValidVersion = isValidVersion;
|
|
161
|
+
var getEnv = function () {
|
|
162
|
+
if (process.platform !== 'darwin')
|
|
163
|
+
return undefined;
|
|
164
|
+
return __assign(__assign({}, process.env), { PATH: "".concat(process.env.PATH, ":/usr/local/bin") });
|
|
165
|
+
};
|
|
150
166
|
var getInstalledJLinkVersion = function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
151
167
|
var env_1, scriptFile, output, versionRegExp, match, e_1;
|
|
152
168
|
var _a;
|
|
@@ -158,7 +174,9 @@ var getInstalledJLinkVersion = function () { return __awaiter(void 0, void 0, vo
|
|
|
158
174
|
case 1:
|
|
159
175
|
_b.trys.push([1, 3, 4, 5]);
|
|
160
176
|
scriptFile = __addDisposableResource(env_1, (0, fs_2.createTemporaryScriptFile)('Exit'), false);
|
|
161
|
-
return [4 /*yield*/, (0, util_1.promisify)(child_process_1.exec)("".concat(getJLinkExePath(), " -CommandFile ").concat(scriptFile.filePath)
|
|
177
|
+
return [4 /*yield*/, (0, util_1.promisify)(child_process_1.exec)("".concat(getJLinkExePath(), " -CommandFile ").concat(scriptFile.filePath), {
|
|
178
|
+
env: getEnv()
|
|
179
|
+
}).catch(function (e) { return e; })];
|
|
162
180
|
case 2:
|
|
163
181
|
output = _b.sent();
|
|
164
182
|
versionRegExp = /^SEGGER J-Link Commander V([0-9a-z.]+) .*$/m;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nordicsemiconductor/nrf-jlink-js",
|
|
3
|
-
"version": "0.13.
|
|
3
|
+
"version": "0.13.1",
|
|
4
4
|
"main": "dist",
|
|
5
5
|
"types": "dist",
|
|
6
6
|
"files": [
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
"semver": "^7.7.2"
|
|
11
11
|
},
|
|
12
12
|
"scripts": {
|
|
13
|
+
"prepare": "npm run build",
|
|
13
14
|
"build": "tsc",
|
|
14
15
|
"upload-jlink": "ts-node scripts/upload-jlink.ts"
|
|
15
16
|
},
|