open-autonomous-connection/luaj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix midlet example including luajc-compiled scripts

Browse Source
This commit is contained in:
James Roseborough
2010-04-25 05:35:24 +00:00
parent 90ca65c7d9
commit de9c967ac5
3 changed files with 96 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
build-midlet.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?>
<project name="sample" default="build" basedir=".">
<project name="sample" default="all" basedir=".">
<!-- find wtk -->
<property environment="env"/>
@@ -16,42 +16,75 @@
<delete failonerror="false" dir="build"/>
</target>
<target name="build">
<target name="dirs">
<mkdir dir="build"/>
<mkdir dir="build/tool"/>
<mkdir dir="build/classes"/>
</target>
<target name="tools" depends="dirs">
<ant antfile="build.xml" target="bcel-lib"/>
<javac destdir="build/tool" classpath="lib/bcel-5.2.jar">
<src path="src/core"/>
<src path="src/jse"/>
</javac>
</target>
<target name="scripts" depends="tools">
<java classname="luajc" classpath="build/tool:lib/bcel-5.2.jar">
<arg line="-verbose"/>
<arg line="-srcdir examples/lua"/>
<arg line="-destdir build/classes"/>
<arg line="hello.lua"/>
</java>
</target>
<target name="classes" depends="dirs">
<wtkbuild srcdir="src/core" destdir="build/classes" preverify="false"/>
<wtkbuild srcdir="src/jme" destdir="build/classes" preverify="false"/>
<wtkbuild srcdir="examples/jme" destdir="build/classes" preverify="false"/>
</target>
<target name="jad">
<wtkjad jadfile="build/sample.jad"
manifest="build/MANIFEST.MF"
name="LuaJ Sample Midlet"
vendor="luaj.org"
version="0.1" >
<midlet name="LuaJ Sample Midlet" class="SampleMIDlet"/>
<attribute name="script" value="hello"/>
</wtkjad>
</target>
<target name="jar" depends="scripts,classes,jad">
<wtkpackage jarfile="build/sample.jar"
jadfile="build/sample.jad"
obfuscate="false"
preverify="false"
autoversion="true">
<fileset dir="build/classes"/>
</wtkpackage>
</target>
<target name="obf" depends="jar">
<wtkobfuscate jarfile="build/sample.jar"
jadfile="build/sample.jad">
<preserve class="hello"/>
<argument value="-printmapping build/mapping.txt"/>
<argument value="-repackageclasses"/>
<argument value='""'/>
</wtkobfuscate>
</target>
<target name="package" depends="jad,jar,obf">
<wtkpreverify jarfile="build/sample.jar"
jadfile="build/sample.jad"/>
<wtkrun jadfile="build/sample.jad" device="DefaultColorPhone"/>
</target>
<target name="run" depends="package">
<wtkrun jadfile="build/sample.jad" device="DefaultColorPhone"/>
</target>
<target name="all" depends="package,run"/>
</project>

2
examples/jme/SampleMIDlet.java
View File

@@ -22,7 +22,7 @@ public class SampleMIDlet extends MIDlet {
// create an environment to run in
LuaC.install();
LuaValue _G = JmePlatform.standardGlobals();
_G.get("dofile").call( LuaValue.valueOf(script) );
_G.get("require").call( LuaValue.valueOf(script) );
}
protected void destroyApp(boolean arg0) throws MIDletStateChangeException {

118
src/jse/luajc.java
View File

@@ -24,18 +24,16 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
import org.luaj.vm2.Lua;
import org.luaj.vm2.compiler.DumpState;
import org.luaj.vm2.luajc.LuaJC;
/**
* Compiler for lua files to compile lua sources into java sources.
* Compiler for lua files to compile lua sources or lua binaries into java classes.
*/
public class luajc {
private static final String version = Lua._VERSION + "Copyright (C) 2009 luaj.org";
@@ -44,9 +42,9 @@ public class luajc {
"usage: java -cp luaj-jse.jar,bcel-5.2.jar luajc [options] [filenames].\n" +
"Available options are:\n" +
" - process stdin\n" +
" -o name output to file 'name' (default is \"luac.out\")\n" +
" -p parse only\n" +
" -s strip debug information\n" +
" -s source directory\n" +
" -d destination directory\n" +
" -n no debug information (strip debug)\n" +
" -e little endian format for numbers\n" +
" -i<n> number format 'n', (n=0,1 or 4, default="+DumpState.NUMBER_FORMAT_DEFAULT+")\n" +
" -v show version information\n" +
@@ -57,13 +55,12 @@ public class luajc {
System.exit(-1);
}
private String output = "luacj.out";
private boolean parseonly = false;
private String srcdir = null;
private String destdir = null;
private boolean stripdebug = false;
private boolean littleendian = false;
private int numberformat = DumpState.NUMBER_FORMAT_DEFAULT;
private boolean versioninfo = false;
private boolean processing = true;
private boolean verbose = false;
public static void main( String[] args ) throws IOException {
new luajc( args );
@@ -73,23 +70,25 @@ public class luajc {
// process args
try {
Vector files = new Vector();
// get stateful args
for ( int i=0; i<args.length; i++ ) {
if ( ! processing || ! args[i].startsWith("-") ) {
// input file - defer to next stage
} else if ( args[i].length() <= 1 ) {
// input file - defer to next stage
if ( ! args[i].startsWith("-") ) {
files.add(args[i]);
} else {
switch ( args[i].charAt(1) ) {
case 'o':
case 's':
if ( ++i >= args.length )
usageExit();
output = args[i];
srcdir = args[i];
break;
case 'p':
parseonly = true;
case 'd':
if ( ++i >= args.length )
usageExit();
destdir = args[i];
break;
case 's':
case 'n':
stripdebug = true;
break;
case 'e':
@@ -101,12 +100,7 @@ public class luajc {
numberformat = Integer.parseInt(args[i].substring(2));
break;
case 'v':
versioninfo = true;
break;
case '-':
if ( args[i].length() > 2 )
usageExit();
processing = false;
verbose = true;
break;
default:
usageExit();
@@ -116,34 +110,28 @@ public class luajc {
}
// echo version
if ( versioninfo )
if ( verbose ) {
System.out.println(version);
// open output file
OutputStream fos = new FileOutputStream( output );
System.out.println("srcdir: "+srcdir);
System.out.println("destdir: "+srcdir);
System.out.println("stripdebug: "+stripdebug);
System.out.println("littleendian: "+littleendian);
System.out.println("numberformat: "+numberformat);
System.out.println("files: "+files);
}
// process input files
try {
processing = true;
for ( int i=0; i<args.length; i++ ) {
if ( ! processing || ! args[i].startsWith("-") ) {
String chunkname = args[i];
processScript( new FileInputStream(args[i]), chunkname, fos );
} else if ( args[i].length() <= 1 ) {
processScript( System.in, "stdin", fos );
} else {
switch ( args[i].charAt(1) ) {
case 'o':
++i;
break;
case '-':
processing = false;
break;
}
}
}
} finally {
fos.close();
for ( int i=0; i<files.size(); i++ ) {
String filename = (String) files.elementAt(i);
int index = filename.lastIndexOf('.');
if ( index < 0 )
usageExit();
String chunkname = filename.substring(0,index);
String sourcepath = srcdir!=null? srcdir+"/"+filename: filename;
if ( verbose )
System.out.println("filename="+filename+" chunkname="+filename+" sourcepath="+sourcepath);
InputStream is = new FileInputStream( sourcepath );
processScript( is, chunkname, filename );
}
} catch ( IOException ioe ) {
@@ -152,23 +140,25 @@ public class luajc {
}
}
private void processScript( InputStream script, String chunkname, OutputStream out ) throws IOException {
private void processScript( InputStream script, String chunkname, String filename) throws IOException {
try {
// create the chunk
Hashtable t = LuaJC.getInstance().compileAll(script, chunkname, chunkname);
Hashtable t = LuaJC.getInstance().compileAll(script, chunkname, filename);
// write out the chunk
if (!parseonly) {
for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
byte[] bytes = (byte[]) t.get(key);
String filename = key + ".class";
if ( versioninfo )
System.out.println(filename+": "+bytes.length+" bytes");
FileOutputStream fos = new FileOutputStream( filename );
fos.write( bytes );
fos.close();
}
for ( Enumeration e = t.keys(); e.hasMoreElements(); ) {
String key = (String) e.nextElement();
byte[] bytes = (byte[]) t.get(key);
String destpath = (destdir!=null? destdir+"/": "") + key + ".class";
if ( verbose )
System.out.println(
"chunk "+chunkname+
" from "+filename+
" written to "+destpath
+" length="+bytes.length+" bytes");
FileOutputStream fos = new FileOutputStream( destpath );
fos.write( bytes );
fos.close();
}
} catch ( Throwable t ) {