Renaming project files and updating changes file. Temporarily keeping luxe specific build file in here.
This commit is contained in:
18
lime/LiME.hx
18
lime/LiME.hx
@@ -181,12 +181,27 @@ class LiME {
|
|||||||
|
|
||||||
//keyboard
|
//keyboard
|
||||||
case SystemEvents.char:
|
case SystemEvents.char:
|
||||||
|
_event.result = 1;
|
||||||
input.lime_onchar(_event);
|
input.lime_onchar(_event);
|
||||||
|
|
||||||
case SystemEvents.keydown:
|
case SystemEvents.keydown:
|
||||||
|
|
||||||
|
#if android
|
||||||
|
if(_event.value == 27) {
|
||||||
|
_event.result = 1;
|
||||||
|
}
|
||||||
|
#end //android
|
||||||
|
|
||||||
input.lime_onkeydown(_event);
|
input.lime_onkeydown(_event);
|
||||||
|
|
||||||
case SystemEvents.keyup:
|
case SystemEvents.keyup:
|
||||||
|
|
||||||
|
#if android
|
||||||
|
if(_event.value == 27) {
|
||||||
|
_event.result = 1;
|
||||||
|
}
|
||||||
|
#end //android
|
||||||
|
|
||||||
input.lime_onkeyup(_event);
|
input.lime_onkeyup(_event);
|
||||||
|
|
||||||
case SystemEvents.gotinputfocus:
|
case SystemEvents.gotinputfocus:
|
||||||
@@ -269,8 +284,7 @@ class LiME {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
result = __updateNextWake();
|
return __updateNextWake();
|
||||||
return result;
|
|
||||||
|
|
||||||
|
|
||||||
} //on_lime_event
|
} //on_lime_event
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
### lime build tools version changes
|
### lime build tools version changes
|
||||||
|
|
||||||
|
_1.0.2_ Added code to handle injecting default project names, adding separate luxe/lime build files.
|
||||||
_1.0.1_ Added helpers for `create` and `copy`
|
_1.0.1_ Added helpers for `create` and `copy`
|
||||||
_1.0.0_ Initial tools to forward commands to openfl-tools
|
_1.0.0_ Initial tools to forward commands to openfl-tools
|
||||||
6
script/build.luxe.hxml
Normal file
6
script/build.luxe.hxml
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
-main RunScript
|
||||||
|
-neko ../../luxe/run.n
|
||||||
|
-lib openfl-tools
|
||||||
|
-D pathtools
|
||||||
|
-D luxe
|
||||||
|
-cp src
|
||||||
@@ -77,6 +77,36 @@ class RunScript {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static function append_project_file(args:Array<String>) : Array<String> {
|
||||||
|
|
||||||
|
var explicit_project = false;
|
||||||
|
|
||||||
|
for(i in 0...args.length) {
|
||||||
|
var arg = args[i];
|
||||||
|
if( arg.indexOf('.xml') != -1 ) {
|
||||||
|
|
||||||
|
var prevarg = '';
|
||||||
|
if(i > 0) { prevarg = args[i-1]; }
|
||||||
|
|
||||||
|
if(prevarg.substr(0,2) != '--') {
|
||||||
|
explicit_project = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
} //if there is an xml mentioned
|
||||||
|
} //for each argument
|
||||||
|
|
||||||
|
if(!explicit_project) {
|
||||||
|
#if luxe
|
||||||
|
args.insert(1,'project.luxe.xml');
|
||||||
|
#else
|
||||||
|
args.insert(1,'project.lime.xml');
|
||||||
|
#end
|
||||||
|
}
|
||||||
|
|
||||||
|
return args;
|
||||||
|
|
||||||
|
} //append_project_file
|
||||||
|
|
||||||
public static var cwd : String = './';
|
public static var cwd : String = './';
|
||||||
public static function main() {
|
public static function main() {
|
||||||
//take all args and forward them to build tools
|
//take all args and forward them to build tools
|
||||||
@@ -91,6 +121,8 @@ class RunScript {
|
|||||||
var local_command = process_command(args);
|
var local_command = process_command(args);
|
||||||
|
|
||||||
if(!local_command) {
|
if(!local_command) {
|
||||||
|
//check if they specify a project file, if not, append our default
|
||||||
|
var args = append_project_file(args);
|
||||||
|
|
||||||
//make a full command line
|
//make a full command line
|
||||||
var full_args = [ "run", "openfl-tools" ].concat(args);
|
var full_args = [ "run", "openfl-tools" ].concat(args);
|
||||||
@@ -98,11 +130,20 @@ class RunScript {
|
|||||||
Sys.setCwd(cwd);
|
Sys.setCwd(cwd);
|
||||||
//and then execute
|
//and then execute
|
||||||
return Sys.command("haxelib", full_args);
|
return Sys.command("haxelib", full_args);
|
||||||
}
|
|
||||||
|
} //!local command
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Sys.println("");
|
Sys.println("");
|
||||||
Sys.println(" lime build tools 1.0.1");
|
|
||||||
|
var version = "1.0.2";
|
||||||
|
|
||||||
|
#if luxe
|
||||||
|
Sys.println(" luxe build tools " + version);
|
||||||
|
#else
|
||||||
|
Sys.println(" lime build tools " + version);
|
||||||
|
#end
|
||||||
|
|
||||||
Sys.println(" commands : ");
|
Sys.println(" commands : ");
|
||||||
Sys.println("\ttest <target> \n\t Build and run");
|
Sys.println("\ttest <target> \n\t Build and run");
|
||||||
Sys.println("\tbuild <target> \n\t Build");
|
Sys.println("\tbuild <target> \n\t Build");
|
||||||
|
|||||||
Reference in New Issue
Block a user