Skip to content

Commit 82f624b

Browse files
author
Minggang Wang
authored
Merge pull request #139 from minggangw/fix-issue-136
Leverage python launcher on windows platform
2 parents 60a6e94 + 21ffbbd commit 82f624b

File tree

2 files changed

+30
-1
lines changed

2 files changed

+30
-1
lines changed

rosidl_parser/py_utils.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Copyright (c) 2017 Intel Corporation. All rights reserved.
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
'use strict';
16+
17+
const os = require('os');
18+
19+
let pyUtils = {
20+
getPython(py) {
21+
if (os.type() === 'Windows_NT') {
22+
py = (py === 'python') ? 'py -2' : 'py -3';
23+
}
24+
return py;
25+
}
26+
};
27+
28+
module.exports = pyUtils;

rosidl_parser/rosidl_parser.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616

1717
const os = require('os');
1818
const exec = require('child_process').exec;
19+
const pyUtils = require('./py_utils');
1920

20-
const pythonExe = (os.type() === 'Windows_NT') ? 'python' : 'python3';
21+
const pythonExe = pyUtils.getPython('python3');
2122

2223
let rosidlParser = {
2324
parseMessageFile(packageName, filePath) {

0 commit comments

Comments
 (0)