Clean up build for distribution.

This commit is contained in:
James Roseborough
2012-10-03 05:43:35 +00:00
parent 7b6381c352
commit 1f69fa38ba
3 changed files with 15 additions and 8 deletions

View File

@@ -65,11 +65,12 @@ Support for lua 5.2.x features:
<li>_ENV environments model. <li>_ENV environments model.
<li>yield from pcall or metatags. <li>yield from pcall or metatags.
<li>Bitwise operator library. <li>Bitwise operator library.
<li>Better coroutine-related garbage collection.
</ul> </ul>
It also includes miscellaneous improvements over luaj 2.0.x: It also includes miscellaneous improvements over luaj 2.0.x:
<ul> <ul>
<li>Garbage collection of orphaned threads. <li>Better coroutine-related garbage collection.
<li>Better debug reporting when using closures.
<li>Line numbers in parse syntax tree.
</ul> </ul>
<h3>Luaj 2.0.x</h3> <h3>Luaj 2.0.x</h3>
Support for luaj 5.1.x features, plus: Support for luaj 5.1.x features, plus:
@@ -741,9 +742,8 @@ and LuaForge:
<li>debug code may not be completely removed by some obfuscators <li>debug code may not be completely removed by some obfuscators
<li>tail calls are not tracked in debug information <li>tail calls are not tracked in debug information
<li>using both version 1 and 2 libraries together in the same java vm has not been tested <li>using both version 1 and 2 libraries together in the same java vm has not been tested
<li>module() and setfenv() only partially supported for lau2java or luajc compiled lua
<li>values associated with weak keys may linger longer than expected <li>values associated with weak keys may linger longer than expected
<li>behavior of luaj when a SecurityManager is used has not been fully characterized <li>behavior of luaj when a SecurityManager is used has not been fully characterized
<li>Negative zero is treated as identical to integer value zero throughout luaj <li>negative zero is treated as identical to integer value zero throughout luaj
</ul> </ul>

View File

@@ -5,8 +5,11 @@
<property name="jar.name.jse" value="luaj-jse-${version}.jar"/> <property name="jar.name.jse" value="luaj-jse-${version}.jar"/>
<property name="jar.name.sources" value="luaj-sources-${version}.jar"/> <property name="jar.name.sources" value="luaj-sources-${version}.jar"/>
<target name="clean"> <target name="clean-build">
<delete dir="build"/> <delete dir="build"/>
</target>
<target name="clean" depends="clean-build">
<delete> <delete>
<fileset dir="." includes="luaj-*.jar"/> <fileset dir="." includes="luaj-*.jar"/>
</delete> </delete>
@@ -20,6 +23,12 @@
</java> </java>
</target> </target>
<target name="plain-parser" depends="javacc-lib">
<java dir="src/jse" fork="true" classname="javacc" classpath="lib/javacc.jar">
<arg line="../../grammar/Lua52.jj"/>
</java>
</target>
<target name="compile" depends="wtk-libs,bcel-lib"> <target name="compile" depends="wtk-libs,bcel-lib">
<delete dir="build/jme/src"/> <delete dir="build/jme/src"/>
<delete dir="build/jse/src"/> <delete dir="build/jse/src"/>

View File

@@ -22,10 +22,8 @@
package org.luaj.vm2.lib.jse; package org.luaj.vm2.lib.jse;
import org.luaj.vm2.Globals; import org.luaj.vm2.Globals;
import org.luaj.vm2.LuaTable;
import org.luaj.vm2.LuaThread; import org.luaj.vm2.LuaThread;
import org.luaj.vm2.LuaValue; import org.luaj.vm2.LuaValue;
import org.luaj.vm2.Varargs;
import org.luaj.vm2.compiler.LuaC; import org.luaj.vm2.compiler.LuaC;
import org.luaj.vm2.lib.Bit32Lib; import org.luaj.vm2.lib.Bit32Lib;
import org.luaj.vm2.lib.CoroutineLib; import org.luaj.vm2.lib.CoroutineLib;
@@ -133,7 +131,7 @@ public class JsePlatform {
LuaValue[] vargs = new LuaValue[args.length]; LuaValue[] vargs = new LuaValue[args.length];
for (int i = 0; i < n; ++i) for (int i = 0; i < n; ++i)
vargs[i] = LuaValue.valueOf(args[i]); vargs[i] = LuaValue.valueOf(args[i]);
LuaTable arg = LuaValue.listOf(vargs); LuaValue arg = LuaValue.listOf(vargs);
arg.set("n", n); arg.set("n", n);
g.set("arg", arg); g.set("arg", arg);
mainChunk.initupvalue1(g); mainChunk.initupvalue1(g);