From 4b9441c0a9fd24b06a853ada22ed2c53a37d7b0e Mon Sep 17 00:00:00 2001 From: Mike Pall Date: Wed, 31 Oct 2012 18:14:49 +0100 Subject: [PATCH] Update docs for release candidate. --- doc/extensions.html | 10 +--------- doc/install.html | 15 +++------------ doc/luajit.html | 2 +- doc/running.html | 15 +-------------- doc/status.html | 8 +++----- 5 files changed, 9 insertions(+), 41 deletions(-) diff --git a/doc/extensions.html b/doc/extensions.html index d32dd37c..dc5fb00a 100644 --- a/doc/extensions.html +++ b/doc/extensions.html @@ -233,19 +233,11 @@ the corresponding metamethod (e.g. "__index").

Fully Resumable VM

-The LuaJIT 2.x VM is fully resumable. This means you can yield from a +The LuaJIT VM is fully resumable. This means you can yield from a coroutine even across contexts, where this would not possible with the standard Lua 5.1 VM: e.g. you can yield across pcall() and xpcall(), across iterators and across metamethods.

-

-Note however that LuaJIT 2.x doesn't use -» Coco anymore. This means the -overhead for creating coroutines is much smaller and no extra -C stacks need to be allocated. OTOH you can no longer yield -across arbitrary C functions. Keep this in mind when -upgrading from LuaJIT 1.x. -

Extensions from Lua 5.2

diff --git a/doc/install.html b/doc/install.html index 7d8636d2..435c6c08 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: 

-tar zxf LuaJIT-2.0.0-beta11.tar.gz
-cd LuaJIT-2.0.0-beta11
+tar zxf LuaJIT-2.0.0.tar.gz +cd LuaJIT-2.0.0

Building LuaJIT

The supplied Makefiles try to auto-detect the settings needed for your @@ -236,15 +236,6 @@ make install PREFIX=/home/myself/lj2

Obviously the prefixes given during build and installation need to be the same.

-

-Note: to avoid overwriting a previous version, the beta test releases -only install the LuaJIT executable under the versioned name (i.e. -luajit-2.0.0-beta11). You probably want to create a symlink -for convenience, with a command like this: -

-
-sudo ln -sf luajit-2.0.0-beta11 /usr/local/bin/luajit
-

Windows Systems

Prerequisites

@@ -461,7 +452,7 @@ much slower than the JIT compiler. Please complain to Apple, not me. Or use Android. :-p 

-IXCODE=/Applications/Xcode45-DP4.app/Contents
+IXCODE=/Applications/Xcode.app/Contents
 ISDK=$IXCODE/Developer/Platforms/iPhoneOS.platform/Developer
 ISDKVER=iPhoneOS6.0.sdk
 ISDKP=$ISDK/usr/bin/
diff --git a/doc/luajit.html b/doc/luajit.html
index 5d021355..8fb0e05f 100644
--- a/doc/luajit.html
+++ b/doc/luajit.html
@@ -176,7 +176,7 @@ LuaJIT is Copyright © 2005-2012 Mike Pall, released under the
 3x
-  100x
 115 KB
VM
 90 KB
JIT
-73 KLOC
C
+63 KLOC
C
 24 KLOC
ASM
 11 KLOC
Lua
 
diff --git a/doc/running.html b/doc/running.html
index 8dd935aa..7870a5d9 100644
--- a/doc/running.html
+++ b/doc/running.html
@@ -86,15 +86,6 @@ POSIX systems or luajit.exe on Windows. It can be used to run simple
 Lua statements or whole Lua applications from the command line. It has an
 interactive mode, too.
 

-

-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 luajit-2.0.0-beta11 to start it or create a symlink
-with a command like this:
-

-
-sudo ln -sf luajit-2.0.0-beta11 /usr/local/bin/luajit
-

 
 
Command Line Options

 

@@ -195,7 +186,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 lib directory of the source
 distribution or installed under the jit directory. By default
-this is /usr/local/share/luajit-2.0.0-beta11/jit on POSIX
+this is /usr/local/share/luajit-2.0.0/jit on POSIX
 systems.
 

 
@@ -217,10 +208,6 @@ optimizations and higher numbers enable more optimizations. Omitting
 the level (i.e. just -O) sets the default optimization level,
 which is -O3 in the current version.
 

-

-Note: Unlike previous versions, optimization is turned on by default in
-LuaJIT 2.0!
It's no longer necessary to use luajit -O.
-

 

 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 6eba8772..f665b9b3 100644
--- a/doc/status.html
+++ b/doc/status.html
@@ -62,11 +62,9 @@ ul li { padding-bottom: 0.3em; }
 
 

 

-LuaJIT 2.0 is the currently active
-development branch in beta test.
-It has » much better performance than
-LuaJIT 1.x and runs on many more platforms and architectures.
-The branch has already been frozen as it's nearing a stable release.
+LuaJIT 2.0 is the current
+stable branch. This branch is in
+feature-freeze — new features will only be added to LuaJIT 2.1.
 

 
 
Current Status