add lua-relang, change luajit version

Author: millken

conf/dyn.conf.1002

@@ -12,7 +12,7 @@ events {
 
 http {
 	lua_code_cache off;
-	lua_package_path '/home/github/tengcdn/lualib/cdn/?.lua;/home/github/tengcdn/lualib/?.lua;;';
+	lua_package_path '/home/github/tengcdn/lualib/?.lua;;';
 	lua_package_cpath '/home/github/tengcdn/lualib/?.so;;';
     lua_shared_dict itesty_limit 100k;
     lua_shared_dict blocked_iplist 10m;

conf/dyn.conf.1003

@@ -37,6 +37,14 @@ http {
 			}
         }
 
+        location /test {
+			content_by_lua_block {
+				local test = require "cdn.test"
+				test.version()
+				ngx.say("done")
+			} 
+        }
+        
         location /limit {
 			access_by_lua_block {
 				local limits = require("resty.iresty_limits")

lualib/cdn/access.lua

@@ -1,5 +1,5 @@
 local cjson = require "cjson"
-local cookie = require "cookie"
+local cookie = require "cdn.cookie"
 
 local   tostring, ipairs, pairs, type, tonumber, next, unpack =
         tostring, ipairs, pairs, type, tonumber, next, unpack

lualib/cdn/test.lua

@@ -0,0 +1,15 @@
+local ngx_say = ngx.say
+local _M = {
+    _VERSION = '0.01',
+}
+local mt = { __index = _M }
+
+function _M.version()
+	if jit then
+		ngx_say(jit.version)
+	else
+		ngx_say("Not LuaJIT!")
+	end
+end
+
+ return _M

script/build.sh

@@ -57,8 +57,8 @@ make
 buildReleaseNgx()
 {
 	cd $NGINX
-	export LUAJIT_INC=/usr/local/luajit-2.0.1/include/luajit-2.0/
-	export LUAJIT_LIB=/usr/local/luajit-2.0.1/lib/
+	export LUAJIT_INC=/usr/local/include/luajit-2.1/
+	export LUAJIT_LIB=/usr/local/lib
 	./configure --prefix=/nginx   \
 	--with-http_ssl_module \
 	--without-http_fastcgi_module \
@@ -81,7 +81,7 @@ buildReleaseNgx()
 	--add-module=../headers-more-nginx-module \
 	--with-ld-opt="-ltcmalloc_minimal -L/home/github/tengcdn/lualib -Wl,--whole-archive -lcdn -Wl,--no-whole-archive" \
 	--with-cc-opt="-O2"
-sed -i 's#-L/usr/local/luajit-2.0.1/lib/ -lluajit-5.1#/usr/local/lib/libluajit-5.1.a#' objs/Makefile #静态编译
+sed -i 's#-L/usr/local/lib -lluajit-5.1#/usr/local/lib/libluajit-5.1.a#' objs/Makefile #静态编译
 sed -i 's#HTTP_AUX_FILTER_MODULES#HTTP_MODULES#' ../lua-upstream-cache-nginx-module/config #fix config
 make
 
@@ -123,11 +123,11 @@ for f in $lualib/cdn/*.lua; do
 	r2="${BASH_REMATCH[2]}"
 	\cp $f $temp_dir/${r1}_${r2}.lua
 	echo $r1/$r2.lua;
-    luajit -bg $temp_dir/${r1}_${r2}.lua $temp_dir/${r1}_${r2}.o
+    luajit-2.1.0-beta1 -b $temp_dir/${r1}_${r2}.lua $temp_dir/${r1}_${r2}.o
 done
 rm -f $lualib/libcdn.a
 ar rcus $lualib/libcdn.a $temp_dir/*.o
-#rm -rf $temp_dir
+rm -rf $temp_dir
 }
 resetNgx()
 {

script/lua-releng

@@ -0,0 +1,98 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use Getopt::Std;
+
+my (@luas, @tests);
+
+my %opts;
+getopts('Lse', \%opts) or die "Usage: lua-releng [-L] [-s] [-e] [files]\n";
+
+my $silent = $opts{s};
+my $stop_on_error = $opts{e};
+my $no_long_line_check = $opts{L};
+
+if ($#ARGV != -1) {
+    @luas = @ARGV;
+
+} else {
+    @luas = map glob, qw{ *.lua lib/*.lua lib/*/*.lua lib/*/*/*.lua lib/*/*/*/*.lua lib/*/*/*/*/*.lua };
+    if (-d 't') {
+        @tests = map glob, qw{ t/*.t t/*/*.t t/*/*/*.t };
+    }
+}
+
+for my $f (sort @luas) {
+    process_file($f);
+}
+
+for my $t (@tests) {
+    blank(qq{grep -H -n --color -E '\\--- ?(ONLY|LAST)' $t});
+}
+# p: prints a string to STDOUT appending \n
+# w: prints a string to STDERR appending \n
+# Both respect the $silent value
+sub p { print "$_[0]\n" if (!$silent) }
+sub w { warn  "$_[0]\n" if (!$silent) }
+
+# blank: runs a command and looks at the output. If the output is not
+# blank it is printed (and the program dies if stop_on_error is 1)
+sub blank {
+    my ($command) = @_;
+    if ($stop_on_error) {
+        my $output = `$command`;
+        if ($output ne '') {
+            die $output;
+        }
+    } else {
+        system($command);
+    }
+}
+
+my $version;
+sub process_file {
+    my $file = shift;
+    # Check the sanity of each .lua file
+    open my $in, $file or
+        die "ERROR: Can't open $file for reading: $!\n";
+    my $found_ver;
+    while (<$in>) {
+        my ($ver, $skipping);
+        if (/(?x) (?:_VERSION|version) \s* = .*? ([\d\.]*\d+) (.*? SKIP)?/) {
+            my $orig_ver = $ver = $1;
+            $found_ver = 1;
+            $skipping = $2;
+            $ver =~ s{^(\d+)\.(\d{3})(\d{3})$}{join '.', int($1), int($2), int($3)}e;
+            w("$file: $orig_ver ($ver)");
+            last;
+
+        } elsif (/(?x) (?:_VERSION|version) \s* = \s* ([a-zA-Z_]\S*)/) {
+            w("$file: $1");
+            $found_ver = 1;
+            last;
+        }
+
+        if ($ver and $version and !$skipping) {
+            if ($version ne $ver) {
+                die "$file: $ver != $version\n";
+            }
+        } elsif ($ver and !$version) {
+            $version = $ver;
+        }
+    }
+    if (!$found_ver) {
+        w("WARNING: No \"_VERSION\" or \"version\" field found in `$file`.");
+    }
+    close $in;
+
+    p("Checking use of Lua global variables in file $file...");
+    p("\top no.\tline\tinstruction\targs\t; code");
+    blank("luac -p -l $file | grep -E '[GS]ETGLOBAL' | grep -vE '\\<(require|type|tostring|error|ngx|ndk|jit|setmetatable|getmetatable|string|table|io|os|print|tonumber|math|pcall|xpcall|unpack|pairs|ipairs|assert|module|package|coroutine|[gs]etfenv|next|rawget|rawset|rawlen)\\>'");
+    unless ($no_long_line_check) {
+        p("Checking line length exceeding 80...");
+        blank("grep -H -n -E --color '.{81}' $file");
+    }
+}
+