Skip to content

Commit

Permalink
fix output path
Browse files Browse the repository at this point in the history
  • Loading branch information
markknol committed Apr 10, 2019
1 parent c15d82d commit 332c820
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions haxelib.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"license": "MIT",
"tags": ["cross", "haxe"],
"description": "Create new Haxe projects in a blast!",
"version": "1.0.0",
"releasenote": "Support lix projects. Tool version can be logged. Project name validation. More logging, better argument error handling. Disallow generate new project in existing folder. Don't generate makefile by default.",
"version": "1.0.1",
"releasenote": "Support lix projects. Tool version can be logged. Project name validation. More logging, better argument error handling. Disallow generate new project in existing folder. Don't generate makefile by default. ",
"contributors": ["markknol"],
"dependencies": {
"hxargs": ""
Expand Down
Binary file modified run.n
Binary file not shown.
7 changes: 4 additions & 3 deletions src/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ class Main {
if (!FileSystem.exists(value)) {
Sys.println('[error] Invalid command "$value"');
doGenerate = false;
} else {
project.curPath = value;
}
}
]);
Expand Down Expand Up @@ -110,8 +112,9 @@ class Project {
public var name:String;
public var binPath:String = "bin";
public var srcPath:String = "src";
public var curPath:String = Sys.getCwd();
public var classPath:String = "";

public var curPath:String = "";
public var outPath:String;

public var doCreateMainClass:Bool = true;
Expand Down Expand Up @@ -141,7 +144,6 @@ class Project {
if (!outPath.endsWith("/")) outPath += "/";
if (!binPath.endsWith("/")) binPath += "/";
if (!srcPath.endsWith("/")) srcPath += "/";
if (!curPath.endsWith("/")) curPath += "/";

if (targets.length == 0) targets.push(DEFAULT_TARGET);

Expand Down Expand Up @@ -449,7 +451,6 @@ class Project {
.replace("$outPath", outPath)
.replace("$binPath", binPath)
.replace("$srcPath", srcPath)
.replace("$curPath", curPath)
.replace("$classPath", classPath)
.replace("$name", name);
}
Expand Down

0 comments on commit 332c820

Please sign in to comment.