186526
/
openresty
mirror of https://github.com/openresty/openresty.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:agentzh/ngx_openresty

This commit is contained in:
agentzh (Yichun Zhang) 2012-11-05 21:30:25 -08:00
parent 0e72914300 6ca011f192
commit 7be71ca17b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
util/mirror-tarballs
View File

@ -283,17 +283,17 @@ patch -p0 < $root/patches/lua-$ver-disable_lua50_compat.patch || exit 1
################################# #################################
ver=2.0.0-beta11 ver=2.0.0-rc1
$root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1 $root/util/get-tarball "http://luajit.org/download/LuaJIT-$ver.tar.gz" -O "LuaJIT-$ver.tar.gz" || exit 1
tar -xzf LuaJIT-$ver.tar.gz || exit 1 tar -xzf LuaJIT-$ver.tar.gz || exit 1
cd LuaJIT-$ver || exit 1; #cd LuaJIT-$ver || exit 1;
$root/util/get-tarball http://luajit.org/download/beta11_hotfix1.patch -O beta11_hotfix1.patch #$root/util/get-tarball http://luajit.org/download/beta11_hotfix1.patch -O beta11_hotfix1.patch
patch -p1 < beta11_hotfix1.patch || exit 1 #patch -p1 < beta11_hotfix1.patch || exit 1
rm beta11_hotfix1.patch || exit 1 #rm beta11_hotfix1.patch || exit 1
#cp $root/misc/unwind-generic.h ./unwind.h || exit 1 #cp $root/misc/unwind-generic.h ./unwind.h || exit 1
cd .. #cd ..
################################# #################################

2
util/ver
View File

@ -2,7 +2,7 @@
#main_ver=1.3.7 #main_ver=1.3.7
main_ver=1.2.4 main_ver=1.2.4
minor_ver=5 minor_ver=7rc1
version=$main_ver.$minor_ver version=$main_ver.$minor_ver
echo $version echo $version