aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2011-05-05 16:17:57 +0200
committerMike Pall <mike>2011-05-05 16:31:13 +0200
commitcfdc356ebe376d9d2d741bae8fd33d1cbdc74f4f (patch)
treece5af91398c831e4849707b96d77545bac5fa090
parent998061f5306e7675900230751413adfff4cc7319 (diff)
downloadluajit-cfdc356ebe376d9d2d741bae8fd33d1cbdc74f4f.tar.gz
luajit-cfdc356ebe376d9d2d741bae8fd33d1cbdc74f4f.tar.bz2
luajit-cfdc356ebe376d9d2d741bae8fd33d1cbdc74f4f.zip
RELEASE LuaJIT-2.0.0-beta7v2.0.0-beta7
-rw-r--r--Makefile2
-rw-r--r--README2
-rw-r--r--doc/changes.html2
-rw-r--r--doc/ext_ffi.html4
-rw-r--r--doc/install.html8
-rw-r--r--doc/running.html6
-rw-r--r--dynasm/dasm_arm.lua6
-rw-r--r--dynasm/dasm_ppc.lua6
-rw-r--r--dynasm/dasm_proto.h4
-rw-r--r--dynasm/dasm_x86.lua6
-rw-r--r--dynasm/dynasm.lua6
-rw-r--r--etc/luajit.pc2
-rw-r--r--src/buildvm_arm.h4
-rw-r--r--src/buildvm_ppcspe.h4
-rw-r--r--src/buildvm_x64.h4
-rw-r--r--src/buildvm_x64win.h4
-rw-r--r--src/buildvm_x86.h4
-rw-r--r--src/luaconf.h4
-rw-r--r--src/luajit.h4
19 files changed, 41 insertions, 41 deletions
diff --git a/Makefile b/Makefile
index d74c581a..dff3dfbf 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@
16MAJVER= 2 16MAJVER= 2
17MINVER= 0 17MINVER= 0
18RELVER= 0 18RELVER= 0
19PREREL= -beta6 19PREREL= -beta7
20VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL) 20VERSION= $(MAJVER).$(MINVER).$(RELVER)$(PREREL)
21ABIVER= 5.1 21ABIVER= 5.1
22NODOTABIVER= 51 22NODOTABIVER= 51
diff --git a/README b/README
index e6ace6b5..4a47bf5d 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1README for LuaJIT 2.0.0-beta6 1README for LuaJIT 2.0.0-beta7
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 cb6feedc..1985c332 100644
--- a/doc/changes.html
+++ b/doc/changes.html
@@ -59,7 +59,7 @@ div.major { max-width: 600px; padding: 1em; margin: 1em 0 1em 0; }
59<div id="main"> 59<div id="main">
60<p> 60<p>
61This is a list of changes between the released versions of LuaJIT.<br> 61This is a list of changes between the released versions of LuaJIT.<br>
62The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta6</strong>.<br> 62The current <span style="color: #c00000;">development version</span> is <strong>LuaJIT&nbsp;2.0.0-beta7</strong>.<br>
63The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.7</strong>. 63The current <span style="color: #0000c0;">stable version</span> is <strong>LuaJIT&nbsp;1.1.7</strong>.
64</p> 64</p>
65<p> 65<p>
diff --git a/doc/ext_ffi.html b/doc/ext_ffi.html
index 6546678e..9b59a3f6 100644
--- a/doc/ext_ffi.html
+++ b/doc/ext_ffi.html
@@ -84,10 +84,10 @@ code a C&nbsp;compiler would generate. Calls to C&nbsp;functions can
84be inlined in JIT-compiled code, unlike calls to functions bound via 84be inlined in JIT-compiled code, unlike calls to functions bound via
85the classic Lua/C API. 85the classic Lua/C API.
86</p> 86</p>
87<p><em> 87<p>
88This page gives a short introduction to the usage of the FFI library. 88This page gives a short introduction to the usage of the FFI library.
89<em>Please use the FFI sub-topics in the navigation bar to learn more.</em> 89<em>Please use the FFI sub-topics in the navigation bar to learn more.</em>
90</em></p> 90</p>
91 91
92<h2 id="call">Motivating Example: Calling External C Functions</h2> 92<h2 id="call">Motivating Example: Calling External C Functions</h2>
93<p> 93<p>
diff --git a/doc/install.html b/doc/install.html
index 7341fd07..868a0c41 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -171,8 +171,8 @@ open a terminal window and change to this directory. Now unpack the archive
171and change to the newly created directory: 171and change to the newly created directory:
172</p> 172</p>
173<pre class="code"> 173<pre class="code">
174tar zxf LuaJIT-2.0.0-beta6.tar.gz 174tar zxf LuaJIT-2.0.0-beta7.tar.gz
175cd LuaJIT-2.0.0-beta6</pre> 175cd LuaJIT-2.0.0-beta7</pre>
176<h3>Building LuaJIT</h3> 176<h3>Building LuaJIT</h3>
177<p> 177<p>
178The supplied Makefiles try to auto-detect the settings needed for your 178The supplied Makefiles try to auto-detect the settings needed for your
@@ -222,11 +222,11 @@ Obviously the prefixes given during build and installation need to be the same.
222<p style="color: #c00000;"> 222<p style="color: #c00000;">
223Note: to avoid overwriting a previous version, the beta test releases 223Note: to avoid overwriting a previous version, the beta test releases
224only install the LuaJIT executable under the versioned name (i.e. 224only install the LuaJIT executable under the versioned name (i.e.
225<tt>luajit-2.0.0-beta6</tt>). You probably want to create a symlink 225<tt>luajit-2.0.0-beta7</tt>). You probably want to create a symlink
226for convenience, with a command like this: 226for convenience, with a command like this:
227</p> 227</p>
228<pre class="code" style="color: #c00000;"> 228<pre class="code" style="color: #c00000;">
229sudo ln -sf luajit-2.0.0-beta6&nbsp;/usr/local/bin/luajit 229sudo ln -sf luajit-2.0.0-beta7&nbsp;/usr/local/bin/luajit
230</pre> 230</pre>
231 231
232<h2 id="windows">Windows Systems</h2> 232<h2 id="windows">Windows Systems</h2>
diff --git a/doc/running.html b/doc/running.html
index 76a393ba..bcc811c4 100644
--- a/doc/running.html
+++ b/doc/running.html
@@ -85,11 +85,11 @@ interactive mode, too.
85<p class="indent" style="color: #c00000;"> 85<p class="indent" style="color: #c00000;">
86Note: the beta test releases only install under the versioned name on 86Note: the beta test releases only install under the versioned name on
87POSIX systems (to avoid overwriting a previous version). You either need 87POSIX systems (to avoid overwriting a previous version). You either need
88to type <tt>luajit-2.0.0-beta6</tt> to start it or create a symlink 88to type <tt>luajit-2.0.0-beta7</tt> to start it or create a symlink
89with a command like this: 89with a command like this:
90</p> 90</p>
91<pre class="code" style="color: #c00000;"> 91<pre class="code" style="color: #c00000;">
92sudo ln -sf luajit-2.0.0-beta6&nbsp;/usr/local/bin/luajit 92sudo ln -sf luajit-2.0.0-beta7&nbsp;/usr/local/bin/luajit
93</pre> 93</pre>
94<p> 94<p>
95Unlike previous versions <b>optimization is turned on by default</b> in 95Unlike previous versions <b>optimization is turned on by default</b> in
@@ -135,7 +135,7 @@ itself. For a description of their options and output format, please
135read the comment block at the start of their source. 135read the comment block at the start of their source.
136They can be found in the <tt>lib</tt> directory of the source 136They can be found in the <tt>lib</tt> directory of the source
137distribution or installed under the <tt>jit</tt> directory. By default 137distribution or installed under the <tt>jit</tt> directory. By default
138this is <tt>/usr/local/share/luajit-2.0.0-beta6/jit</tt> on POSIX 138this is <tt>/usr/local/share/luajit-2.0.0-beta7/jit</tt> on POSIX
139systems. 139systems.
140</p> 140</p>
141 141
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua
index 19bc94b8..119ed2ee 100644
--- a/dynasm/dasm_arm.lua
+++ b/dynasm/dasm_arm.lua
@@ -9,9 +9,9 @@
9local _info = { 9local _info = {
10 arch = "arm", 10 arch = "arm",
11 description = "DynASM ARM module", 11 description = "DynASM ARM module",
12 version = "1.2.2", 12 version = "1.3.0",
13 vernum = 10202, 13 vernum = 10300,
14 release = "2011-03-23", 14 release = "2011-05-05",
15 author = "Mike Pall", 15 author = "Mike Pall",
16 license = "MIT", 16 license = "MIT",
17} 17}
diff --git a/dynasm/dasm_ppc.lua b/dynasm/dasm_ppc.lua
index 01376f76..bb6de01e 100644
--- a/dynasm/dasm_ppc.lua
+++ b/dynasm/dasm_ppc.lua
@@ -9,9 +9,9 @@
9local _info = { 9local _info = {
10 arch = "ppc", 10 arch = "ppc",
11 description = "DynASM PPC module", 11 description = "DynASM PPC module",
12 version = "1.2.2", 12 version = "1.3.0",
13 vernum = 10202, 13 vernum = 10300,
14 release = "2011-01-09", 14 release = "2011-05-05",
15 author = "Mike Pall", 15 author = "Mike Pall",
16 license = "MIT", 16 license = "MIT",
17} 17}
diff --git a/dynasm/dasm_proto.h b/dynasm/dasm_proto.h
index 7fac22ab..dc9ed510 100644
--- a/dynasm/dasm_proto.h
+++ b/dynasm/dasm_proto.h
@@ -10,8 +10,8 @@
10#include <stddef.h> 10#include <stddef.h>
11#include <stdarg.h> 11#include <stdarg.h>
12 12
13#define DASM_IDENT "DynASM 1.2.2" 13#define DASM_IDENT "DynASM 1.3.0"
14#define DASM_VERSION 10202 /* 1.2.2 */ 14#define DASM_VERSION 10300 /* 1.3.0 */
15 15
16#ifndef Dst_DECL 16#ifndef Dst_DECL
17#define Dst_DECL dasm_State **Dst 17#define Dst_DECL dasm_State **Dst
diff --git a/dynasm/dasm_x86.lua b/dynasm/dasm_x86.lua
index 4ade52f0..5571f93e 100644
--- a/dynasm/dasm_x86.lua
+++ b/dynasm/dasm_x86.lua
@@ -11,9 +11,9 @@ local x64 = x64
11local _info = { 11local _info = {
12 arch = x64 and "x64" or "x86", 12 arch = x64 and "x64" or "x86",
13 description = "DynASM x86/x64 module", 13 description = "DynASM x86/x64 module",
14 version = "1.2.2", 14 version = "1.3.0",
15 vernum = 10202, 15 vernum = 10300,
16 release = "2011-01-09", 16 release = "2011-05-05",
17 author = "Mike Pall", 17 author = "Mike Pall",
18 license = "MIT", 18 license = "MIT",
19} 19}
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua
index da94744e..8ff98513 100644
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -10,9 +10,9 @@
10local _info = { 10local _info = {
11 name = "DynASM", 11 name = "DynASM",
12 description = "A dynamic assembler for code generation engines", 12 description = "A dynamic assembler for code generation engines",
13 version = "1.2.2", 13 version = "1.3.0",
14 vernum = 10202, 14 vernum = 10300,
15 release = "2011-01-09", 15 release = "2011-05-05",
16 author = "Mike Pall", 16 author = "Mike Pall",
17 url = "http://luajit.org/dynasm.html", 17 url = "http://luajit.org/dynasm.html",
18 license = "MIT", 18 license = "MIT",
diff --git a/etc/luajit.pc b/etc/luajit.pc
index 6ead2678..02487136 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}-beta6 5version=${majver}.${minver}.${relver}-beta7
6abiver=5.1 6abiver=5.1
7 7
8prefix=/usr/local 8prefix=/usr/local
diff --git a/src/buildvm_arm.h b/src/buildvm_arm.h
index a5f16897..9e0b2a55 100644
--- a/src/buildvm_arm.h
+++ b/src/buildvm_arm.h
@@ -1,11 +1,11 @@
1/* 1/*
2** This file has been pre-processed with DynASM. 2** This file has been pre-processed with DynASM.
3** http://luajit.org/dynasm.html 3** http://luajit.org/dynasm.html
4** DynASM version 1.2.2, DynASM arm version 1.2.2 4** DynASM version 1.3.0, DynASM arm version 1.3.0
5** DO NOT EDIT! The original file is in "buildvm_arm.dasc". 5** DO NOT EDIT! The original file is in "buildvm_arm.dasc".
6*/ 6*/
7 7
8#if DASM_VERSION != 10202 8#if DASM_VERSION != 10300
9#error "Version mismatch between DynASM and included encoding engine" 9#error "Version mismatch between DynASM and included encoding engine"
10#endif 10#endif
11 11
diff --git a/src/buildvm_ppcspe.h b/src/buildvm_ppcspe.h
index 003b199d..30497fc7 100644
--- a/src/buildvm_ppcspe.h
+++ b/src/buildvm_ppcspe.h
@@ -1,11 +1,11 @@
1/* 1/*
2** This file has been pre-processed with DynASM. 2** This file has been pre-processed with DynASM.
3** http://luajit.org/dynasm.html 3** http://luajit.org/dynasm.html
4** DynASM version 1.2.2, DynASM ppc version 1.2.2 4** DynASM version 1.3.0, DynASM ppc version 1.3.0
5** DO NOT EDIT! The original file is in "buildvm_ppc.dasc". 5** DO NOT EDIT! The original file is in "buildvm_ppc.dasc".
6*/ 6*/
7 7
8#if DASM_VERSION != 10202 8#if DASM_VERSION != 10300
9#error "Version mismatch between DynASM and included encoding engine" 9#error "Version mismatch between DynASM and included encoding engine"
10#endif 10#endif
11 11
diff --git a/src/buildvm_x64.h b/src/buildvm_x64.h
index fb6f57f9..fe439c75 100644
--- a/src/buildvm_x64.h
+++ b/src/buildvm_x64.h
@@ -1,11 +1,11 @@
1/* 1/*
2** This file has been pre-processed with DynASM. 2** This file has been pre-processed with DynASM.
3** http://luajit.org/dynasm.html 3** http://luajit.org/dynasm.html
4** DynASM version 1.2.2, DynASM x64 version 1.2.2 4** DynASM version 1.3.0, DynASM x64 version 1.3.0
5** DO NOT EDIT! The original file is in "buildvm_x86.dasc". 5** DO NOT EDIT! The original file is in "buildvm_x86.dasc".
6*/ 6*/
7 7
8#if DASM_VERSION != 10202 8#if DASM_VERSION != 10300
9#error "Version mismatch between DynASM and included encoding engine" 9#error "Version mismatch between DynASM and included encoding engine"
10#endif 10#endif
11 11
diff --git a/src/buildvm_x64win.h b/src/buildvm_x64win.h
index 4b3f5237..f6fa13dc 100644
--- a/src/buildvm_x64win.h
+++ b/src/buildvm_x64win.h
@@ -1,11 +1,11 @@
1/* 1/*
2** This file has been pre-processed with DynASM. 2** This file has been pre-processed with DynASM.
3** http://luajit.org/dynasm.html 3** http://luajit.org/dynasm.html
4** DynASM version 1.2.2, DynASM x64 version 1.2.2 4** DynASM version 1.3.0, DynASM x64 version 1.3.0
5** DO NOT EDIT! The original file is in "buildvm_x86.dasc". 5** DO NOT EDIT! The original file is in "buildvm_x86.dasc".
6*/ 6*/
7 7
8#if DASM_VERSION != 10202 8#if DASM_VERSION != 10300
9#error "Version mismatch between DynASM and included encoding engine" 9#error "Version mismatch between DynASM and included encoding engine"
10#endif 10#endif
11 11
diff --git a/src/buildvm_x86.h b/src/buildvm_x86.h
index 8ada18ac..42a0b75b 100644
--- a/src/buildvm_x86.h
+++ b/src/buildvm_x86.h
@@ -1,11 +1,11 @@
1/* 1/*
2** This file has been pre-processed with DynASM. 2** This file has been pre-processed with DynASM.
3** http://luajit.org/dynasm.html 3** http://luajit.org/dynasm.html
4** DynASM version 1.2.2, DynASM x86 version 1.2.2 4** DynASM version 1.3.0, DynASM x86 version 1.3.0
5** DO NOT EDIT! The original file is in "buildvm_x86.dasc". 5** DO NOT EDIT! The original file is in "buildvm_x86.dasc".
6*/ 6*/
7 7
8#if DASM_VERSION != 10202 8#if DASM_VERSION != 10300
9#error "Version mismatch between DynASM and included encoding engine" 9#error "Version mismatch between DynASM and included encoding engine"
10#endif 10#endif
11 11
diff --git a/src/luaconf.h b/src/luaconf.h
index 75c88581..ceab5ed6 100644
--- a/src/luaconf.h
+++ b/src/luaconf.h
@@ -26,12 +26,12 @@
26#define LUA_LDIR LUA_ROOT "share/lua/5.1/" 26#define LUA_LDIR LUA_ROOT "share/lua/5.1/"
27#define LUA_CDIR LUA_ROOT "lib/lua/5.1/" 27#define LUA_CDIR LUA_ROOT "lib/lua/5.1/"
28#ifdef LUA_XROOT 28#ifdef LUA_XROOT
29#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta6/" 29#define LUA_JDIR LUA_XROOT "share/luajit-2.0.0-beta7/"
30#define LUA_XPATH \ 30#define LUA_XPATH \
31 ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua" 31 ";" LUA_XROOT "share/lua/5.1/?.lua;" LUA_XROOT "share/lua/5.1/?/init.lua"
32#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;" 32#define LUA_XCPATH LUA_XROOT "lib/lua/5.1/?.so;"
33#else 33#else
34#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta6/" 34#define LUA_JDIR LUA_ROOT "share/luajit-2.0.0-beta7/"
35#define LUA_XPATH 35#define LUA_XPATH
36#define LUA_XCPATH 36#define LUA_XCPATH
37#endif 37#endif
diff --git a/src/luajit.h b/src/luajit.h
index f38d58a1..4ea529ec 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-beta6" 33#define LUAJIT_VERSION "LuaJIT 2.0.0-beta7"
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_beta6 35#define LUAJIT_VERSION_SYM luaJIT_version_2_0_0_beta7
36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2011 Mike Pall" 36#define LUAJIT_COPYRIGHT "Copyright (C) 2005-2011 Mike Pall"
37#define LUAJIT_URL "http://luajit.org/" 37#define LUAJIT_URL "http://luajit.org/"
38 38