aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--README2
-rw-r--r--doc/changes.html15
-rw-r--r--doc/install.html8
-rw-r--r--doc/running.html6
-rw-r--r--etc/luajit.pc2
-rw-r--r--src/luaconf.h4
-rw-r--r--src/luajit.h4
8 files changed, 20 insertions, 23 deletions
diff --git a/Makefile b/Makefile
index 2a55260b..a4a356eb 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
15MAJVER= 2 15MAJVER= 2
16MINVER= 0 16MINVER= 0
17RELVER= 0 17RELVER= 0
18PREREL= -beta2 18PREREL= -beta3
19VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) 19VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
20ABIVER= 5.1 20ABIVER= 5.1
21NODOTABIVER= 51 21NODOTABIVER= 51
diff --git a/README b/README
index 5eeb12ea..90ae74db 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1README for LuaJIT 2.0.0-beta2 1README for LuaJIT 2.0.0-beta3
2----------------------------- 2-----------------------------
3 3
4LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. 4LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language.
diff --git a/doc/changes.html b/doc/changes.html
index 4f3a489c..5ef8b4cd 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -43,7 +43,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; }
43<div id="main"> 43<div id="main">
44<p> 44<p>
45This is a list of changes between the released versions of LuaJIT.<br> 45This is a list of changes between the released versions of LuaJIT.<br>
46The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta2</strong>.<br> 46The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta3</strong>.<br>
47The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.5</strong>. 47The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.5</strong>.
48</p> 48</p>
49<p> 49<p>
@@ -51,18 +51,17 @@ Please check the
51<a href="http://luajit.org/changes.html"><span class="ext">&raquo;</span>&nbsp;Online Change History</a> 51<a href="http://luajit.org/changes.html"><span class="ext">&raquo;</span>&nbsp;Online Change History</a>
52to see whether newer versions are available. 52to see whether newer versions are available.
53</p> 53</p>
54 54<div class="major" style="background: #ffd0d0;">
55<div class="major" style="background: #d0d0d0;"> 55<h2 id="LuaJIT-2.0.0-beta3">LuaJIT 2.0.0-beta3 &mdash; 2010-03-07</h2>
56<h2 id="snap">Development Snapshot</h2>
57<ul> 56<ul>
58<li>Portability: 57<li>LuaJIT x64 port:</li>
59<ul> 58<ul>
60<li>Port integrated memory allocator to Linux/x64, Windows/x64 and OSX/x64.</li> 59<li>Port integrated memory allocator to Linux/x64, Windows/x64 and OSX/x64.</li>
61<li>Port interpreter and JIT compiler to x64.</li> 60<li>Port interpreter and JIT compiler to x64.</li>
62<li>Port DynASM to x64.</li> 61<li>Port DynASM to x64.</li>
63<li>Many 32/64 bit cleanups in the VM.</li> 62<li>Many 32/64 bit cleanups in the VM.</li>
64<li>Allow building the interpreter with either x87 or SSE2 arithmetics.</li> 63<li>Allow building the interpreter with either x87 or SSE2 arithmetics.</li>
65<li>Disable JIT compiler on older non-SSE2 CPUs instead of aborting.</li> 64<li>Add external unwinding and C++ exception interop (default on x64).</li>
66</ul></li> 65</ul></li>
67<li>Correctness and completeness: 66<li>Correctness and completeness:
68<ul> 67<ul>
@@ -76,7 +75,7 @@ to see whether newer versions are available.
76<li>Drive the GC forward on string allocations in the parser.</li> 75<li>Drive the GC forward on string allocations in the parser.</li>
77<li>Implement call/return hooks (zero-cost if disabled).</li> 76<li>Implement call/return hooks (zero-cost if disabled).</li>
78<li>Implement yield from C hooks.</li> 77<li>Implement yield from C hooks.</li>
79<li>Add external unwinding and C++ exception interop (default on x64).</li> 78<li>Disable JIT compiler on older non-SSE2 CPUs instead of aborting.</li>
80</ul></li> 79</ul></li>
81<li>Structural and performance enhancements: 80<li>Structural and performance enhancements:
82<ul> 81<ul>
@@ -100,9 +99,7 @@ to see whether newer versions are available.
100and <tt>math.random()</tt>.</li> 99and <tt>math.random()</tt>.</li>
101</ul></li> 100</ul></li>
102</ul> 101</ul>
103</div>
104 102
105<div class="major" style="background: #ffd0d0;">
106<h2 id="LuaJIT-2.0.0-beta2">LuaJIT 2.0.0-beta2 &mdash; 2009-11-09</h2> 103<h2 id="LuaJIT-2.0.0-beta2">LuaJIT 2.0.0-beta2 &mdash; 2009-11-09</h2>
107<ul> 104<ul>
108<li>Reorganize build system. Build static+shared library on POSIX.</li> 105<li>Reorganize build system. Build static+shared library on POSIX.</li>
diff --git a/doc/install.html b/doc/install.html
index ae50ee8d..f45459ec 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -133,8 +133,8 @@ terminal window and change to this directory. Now unpack the archive
133and change to the newly created directory: 133and change to the newly created directory:
134</p> 134</p>
135<pre class="code"> 135<pre class="code">
136tar zxf LuaJIT-2.0.0-beta2.tar.gz 136tar zxf LuaJIT-2.0.0-beta3.tar.gz
137cd LuaJIT-2.0.0-beta2</pre> 137cd LuaJIT-2.0.0-beta3</pre>
138<h3>Building LuaJIT</h3> 138<h3>Building LuaJIT</h3>
139<p> 139<p>
140The supplied Makefiles try to auto-detect the settings needed for your 140The supplied Makefiles try to auto-detect the settings needed for your
@@ -182,11 +182,11 @@ Obviously the prefixes given during build and installation need to be the same.
182<p style="color: #c00000;"> 182<p style="color: #c00000;">
183Note: to avoid overwriting a previous version, the beta test releases 183Note: to avoid overwriting a previous version, the beta test releases
184only install the LuaJIT executable under the versioned name (i.e. 184only install the LuaJIT executable under the versioned name (i.e.
185<tt>luajit-2.0.0-beta2</tt>). You probably want to create a symlink 185<tt>luajit-2.0.0-beta3</tt>). You probably want to create a symlink
186for convenience, with a command like this: 186for convenience, with a command like this:
187</p> 187</p>
188<pre class="code" style="color: #c00000;"> 188<pre class="code" style="color: #c00000;">
189sudo ln -sf luajit-2.0.0-beta2&nbsp;/usr/local/bin/luajit 189sudo ln -sf luajit-2.0.0-beta3&nbsp;/usr/local/bin/luajit
190</pre> 190</pre>
191 191
192<h2 id="windows">Windows Systems</h2> 192<h2 id="windows">Windows Systems</h2>
diff --git a/doc/running.html b/doc/running.html
index bec93f1f..96f1fa09 100644
--- a/doc/running.html
+++ b/doc/running.html
@@ -69,11 +69,11 @@ interactive mode, too.
69<p class="indent" style="color: #c00000;"> 69<p class="indent" style="color: #c00000;">
70Note: the beta test releases only install under the versioned name on 70Note: the beta test releases only install under the versioned name on
71POSIX systems (to avoid overwriting a previous version). You either need 71POSIX systems (to avoid overwriting a previous version). You either need
72to type <tt>luajit-2.0.0-beta2</tt> to start it or create a symlink 72to type <tt>luajit-2.0.0-beta3</tt> to start it or create a symlink
73with a command like this: 73with a command like this:
74</p> 74</p>
75<pre class="code" style="color: #c00000;"> 75<pre class="code" style="color: #c00000;">
76sudo ln -sf luajit-2.0.0-beta2&nbsp;/usr/local/bin/luajit 76sudo ln -sf luajit-2.0.0-beta3&nbsp;/usr/local/bin/luajit
77</pre> 77</pre>
78<p> 78<p>
79Unlike previous versions <b>optimization is turned on by default</b> in 79Unlike previous versions <b>optimization is turned on by default</b> in
@@ -119,7 +119,7 @@ itself. For a description of their options and output format, please
119read the comment block at the start of their source. 119read the comment block at the start of their source.
120They can be found in the <tt>lib</tt> directory of the source 120They can be found in the <tt>lib</tt> directory of the source
121distribution or installed under the <tt>jit</tt> directory. By default 121distribution or installed under the <tt>jit</tt> directory. By default
122this is <tt>/usr/local/share/luajit-2.0.0-beta2/jit</tt> on POSIX 122this is <tt>/usr/local/share/luajit-2.0.0-beta3/jit</tt> on POSIX
123systems. 123systems.
124</p> 124</p>
125 125
diff --git a/etc/luajit.pc b/etc/luajit.pc
index f0490097..d1620019 100644
--- a/etc/luajit.pc
+++ b/etc/luajit.pc
@@ -2,7 +2,7 @@
2majver=2 2majver=2
3minver=0 3minver=0
4relver=0 4relver=0
5version=${majver}.${minver}.${relver}-beta2 5version=${majver}.${minver}.${relver}-beta3
6abiver=5.1 6abiver=5.1
7 7
8prefix=/usr/local 8prefix=/usr/local
diff --git a/src/luaconf.h b/src/luaconf.h
index 53cb8fb1..cbb3685d 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -37,12 +37,12 @@
37#define LUA_LDIR LUA_ROOT "share/lua/5.1/" 37#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
38#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" 38#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
39#ifdef LUA_XROOT 39#ifdef LUA_XROOT
40#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta2/" 40#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta3/"
41#define LUA_XPATH \ 41#define LUA_XPATH \
42 ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua" 42 ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
43#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;" 43#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
44#else 44#else
45#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta2/" 45#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta3/"
46#define LUA_XPATH 46#define LUA_XPATH
47#define LUA_XCPATH 47#define LUA_XCPATH
48#endif 48#endif
diff --git a/src/luajit.h b/src/luajit.h
index 91b59404..a64656ca 100644
--- a/src/luajit.h
+++ b/src/luajit.h
@@ -30,9 +30,9 @@
30 30
31#include "lua.h" 31#include "lua.h"
32 32
33#define LUAJIT_VERSION "LuaJIT 2.0.0-beta2" 33#define LUAJIT_VERSION "LuaJIT 2.0.0-beta3"
34#define LUAJIT_VERSION_NUM 20000 /* Version 2.0.0 = 02.00.00. */ 34#define LUAJIT_VERSION_NUM 20000 /* Version 2.0.0 = 02.00.00. */
35#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta2 35#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta3
36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2010 Mike Pall" 36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2010 Mike Pall"
37#define LUAJIT_URL "http://luajit.org/" 37#define LUAJIT_URL "http://luajit.org/"
38 38