diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | doc/changes.html | 2 | ||||
| -rw-r--r-- | doc/install.html | 8 | ||||
| -rw-r--r-- | doc/luajit.html | 2 | ||||
| -rw-r--r-- | doc/running.html | 14 | ||||
| -rw-r--r-- | doc/status.html | 11 | ||||
| -rw-r--r-- | etc/luajit.pc | 2 | ||||
| -rw-r--r-- | src/luaconf.h | 4 | ||||
| -rw-r--r-- | src/luajit.h | 4 |
10 files changed, 21 insertions, 30 deletions
@@ -16,7 +16,7 @@ MAJVER= 2 MINVER= 0 RELVER= 0 -PREREL= -beta10 +PREREL= -beta11 VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) ABIVER= 5.1 @@ -1,4 +1,4 @@ -README for LuaJIT 2.0.0-beta10 +README for LuaJIT 2.0.0-beta11 ------------------------------ LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming language. diff --git a/doc/changes.html b/doc/changes.html index 20c2fc59..2bc1171a 100644 --- a/doc/changes.html +++ b/doc/changes.html @@ -63,7 +63,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; } <div id="main"> <p> This is a list of changes between the released versions of LuaJIT.<br> -The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT 2.0.0-beta10</strong>.<br> +The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT 2.0.0-beta11</strong>.<br> The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT 1.1.8</strong>. </p> <p> diff --git a/doc/install.html b/doc/install.html index ab2cdda5..c74a57c7 100644 --- a/doc/install.html +++ b/doc/install.html @@ -188,8 +188,8 @@ open a terminal window and change to this directory. Now unpack the archive and change to the newly created directory: </p> <pre class="code"> -tar zxf LuaJIT-2.0.0-beta10.tar.gz -cd LuaJIT-2.0.0-beta10</pre> +tar zxf LuaJIT-2.0.0-beta11.tar.gz +cd LuaJIT-2.0.0-beta11</pre> <h3>Building LuaJIT</h3> <p> The supplied Makefiles try to auto-detect the settings needed for your @@ -239,11 +239,11 @@ Obviously the prefixes given during build and installation need to be the same. <p style="color: #c00000;"> Note: to avoid overwriting a previous version, the beta test releases only install the LuaJIT executable under the versioned name (i.e. -<tt>luajit-2.0.0-beta10</tt>). You probably want to create a symlink +<tt>luajit-2.0.0-beta11</tt>). You probably want to create a symlink for convenience, with a command like this: </p> <pre class="code" style="color: #c00000;"> -sudo ln -sf luajit-2.0.0-beta10 /usr/local/bin/luajit +sudo ln -sf luajit-2.0.0-beta11 /usr/local/bin/luajit </pre> <h2 id="windows">Windows Systems</h2> diff --git a/doc/luajit.html b/doc/luajit.html index 9ab12899..5d021355 100644 --- a/doc/luajit.html +++ b/doc/luajit.html @@ -197,7 +197,7 @@ cross-language benchmarks since its first release — often by a substantial margin. </p> <p> -For <b>LuaJIT 2.0</b> the whole VM has been rewritten from the ground up +For <b>LuaJIT 2.0</b>, the whole VM has been rewritten from the ground up and relentlessly optimized for performance. It combines a <b>high-speed interpreter</b>, written in assembler, with a <b>state-of-the-art JIT compiler</b>. diff --git a/doc/running.html b/doc/running.html index eddb7ad7..8dd935aa 100644 --- a/doc/running.html +++ b/doc/running.html @@ -89,16 +89,12 @@ interactive mode, too. <p class="indent" style="color: #c00000;"> Note: the beta test releases only install under the versioned name on POSIX systems (to avoid overwriting a previous version). You either need -to type <tt>luajit-2.0.0-beta10</tt> to start it or create a symlink +to type <tt>luajit-2.0.0-beta11</tt> to start it or create a symlink with a command like this: </p> <pre class="code" style="color: #c00000;"> -sudo ln -sf luajit-2.0.0-beta10 /usr/local/bin/luajit +sudo ln -sf luajit-2.0.0-beta11 /usr/local/bin/luajit </pre> -<p> -Unlike previous versions <b>optimization is turned on by default</b> in -LuaJIT 2.0!<br>It's no longer necessary to use <tt>luajit -O</tt>. -</p> <h2 id="options">Command Line Options</h2> <p> @@ -199,7 +195,7 @@ itself. For a description of their options and output format, please read the comment block at the start of their source. They can be found in the <tt>lib</tt> directory of the source distribution or installed under the <tt>jit</tt> directory. By default -this is <tt>/usr/local/share/luajit-2.0.0-beta10/jit</tt> on POSIX +this is <tt>/usr/local/share/luajit-2.0.0-beta11/jit</tt> on POSIX systems. </p> @@ -221,6 +217,10 @@ optimizations and higher numbers enable more optimizations. Omitting the level (i.e. just <tt>-O</tt>) sets the default optimization level, which is <tt>-O3</tt> in the current version. </p> +<p style="font-size: 8pt;"> +Note: Unlike previous versions, <b>optimization is turned on by default</b> in +LuaJIT 2.0!<br>It's no longer necessary to use <tt>luajit -O</tt>. +</p> <p> The second form adds or removes individual optimization flags. The third form sets a parameter for the VM or the JIT compiler diff --git a/doc/status.html b/doc/status.html index 6bb4df89..574cf3ce 100644 --- a/doc/status.html +++ b/doc/status.html @@ -62,20 +62,11 @@ ul li { padding-bottom: 0.3em; } </div> <div id="main"> <p> -The <span style="color: #0000c0;">LuaJIT 1.x</span> series represents -the current <span style="color: #0000c0;">stable branch</span>. -Only a single bug has been discovered in the last three years. So, if -you need a rock-solid VM, you are encouraged to fetch the latest -release of LuaJIT 1.x from the <a href="http://luajit.org/download.html"><span class="ext">»</span> Download</a> -page. -</p> -<p> <span style="color: #c00000;">LuaJIT 2.0</span> is the currently active <span style="color: #c00000;">development branch</span> in beta test. It has <a href="http://luajit.org/performance.html"><span class="ext">»</span> much better performance</a> than LuaJIT 1.x and runs on many more platforms and architectures. -It's nearing a stable release, so you should definitely -start to evaluate it for new projects right now. +The branch has already been frozen as it's nearing a stable release. </p> <h2>Current Status</h2> diff --git a/etc/luajit.pc b/etc/luajit.pc index 9fc4754a..6d4413c8 100644 --- a/etc/luajit.pc +++ b/etc/luajit.pc @@ -2,7 +2,7 @@ majver=2 minver=0 relver=0 -version=${majver}.${minver}.${relver}-beta10 +version=${majver}.${minver}.${relver}-beta11 abiver=5.1 prefix=/usr/local diff --git a/src/luaconf.h b/src/luaconf.h index 7e084e7c..df70be2c 100644 --- a/src/luaconf.h +++ b/src/luaconf.h @@ -30,12 +30,12 @@ #define LUA_LDIR LUA_ROOT "share/lua/5.1/" #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" #ifdef LUA_XROOT -#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta10/" +#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta11/" #define LUA_XPATH \ ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua" #define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;" #else -#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta10/" +#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta11/" #define LUA_XPATH #define LUA_XCPATH #endif diff --git a/src/luajit.h b/src/luajit.h index 10e926e1..d4d0e9e3 100644 --- a/src/luajit.h +++ b/src/luajit.h @@ -30,9 +30,9 @@ #include "lua.h" -#define LUAJIT_VERSION "LuaJIT 2.0.0-beta10" +#define LUAJIT_VERSION "LuaJIT 2.0.0-beta11" #define LUAJIT_VERSION_NUM 20000 /* Version 2.0.0 = 02.00.00. */ -#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta10 +#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta11 #define LUAJIT_COPYRIGHT "Copyright (C) 2005-2012 Mike Pall" #define LUAJIT_URL "http://luajit.org/" |