Compare commits

...

2 Commits

Author SHA1 Message Date
calebboyd 1e57f3268b fix: handle relative paths for input 2017-09-27 16:21:45 -05:00
James M. Greene dc76aea5c8 Prepend the Python path for Windows for overriding 2017-07-05 16:57:58 -05:00
3 changed files with 6 additions and 20 deletions
+3 -17
View File
@@ -68,21 +68,10 @@ if (argv.h || argv.help) {
process.exit(); process.exit();
} }
/**
* TODO: Support network shares?
**/
function toAbsolute(pt) { function toAbsolute(pt) {
//already resolved? if (path.isAbsolute(pt)) {
try{ return pt
fs.accessSync(pt,fs.F_OK); }
return pt;
}catch(e){}
if (pt.substr(0, 1) == "/") return pt; // for *nix "/"
if (pt.substr(0, 2) == "\\\\") return pt; // for windows "\\"
if (pt.substr(1, 3) == ":/") return pt; // for windows "c:/"
// otherwise...
return path.join(process.cwd(), pt); return path.join(process.cwd(), pt);
} }
@@ -94,9 +83,6 @@ if (fs.lstatSync(argv.i).isDirectory()) {
} }
}); });
} else { } else {
/**
* Call the core
**/
nexe.compile({ nexe.compile({
input: require.resolve(toAbsolute(argv.i)), input: require.resolve(toAbsolute(argv.i)),
output: toAbsolute(argv.o), output: toAbsolute(argv.o),
+2 -2
View File
@@ -471,8 +471,8 @@ function _getNodeCompiler(nodeFileDir, nodeConfigureArgs, nodeMakeArgs, nodeVCBu
var newEnv = process.env var newEnv = process.env
if (isPy !== "python") { if (isPy !== "python") {
// add the dir of the suposed python exe to path // add the dir of the supposed python exe to path
newEnv.path = process.env.PATH + ";" + path.dirname(isPy) newEnv.path = path.dirname(isPy) + ";" + process.env.PATH
} }
if (!nodeVCBuildArgs || !nodeVCBuildArgs.length) { if (!nodeVCBuildArgs || !nodeVCBuildArgs.length) {
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "nexe", "name": "nexe",
"description": "create single executables out of your [node/io].js applications", "description": "create single executables out of your [node/io].js applications",
"license": "MIT", "license": "MIT",
"version": "1.1.2", "version": "1.1.6",
"contributors": [ "contributors": [
{ {
"name": "Criag Condon", "name": "Criag Condon",