Permalink
Browse files

confirmed that we work with nginx 1.0.5.

  • Loading branch information...
1 parent 137855d commit 78286ca0d804155230f98aaa7ed6ce5fb8ea765b @agentzh agentzh committed Aug 9, 2011
Showing with 22 additions and 56 deletions.
  1. +1 −1 doc/readme.wiki
  2. +21 −55 util/build.sh
View
@@ -259,7 +259,7 @@ Download the latest version of the release tarball of this module from [http://g
The following versions of Nginx should work with this module:
-* '''1.0.x''' (last tested: 1.0.2)
+* '''1.0.x''' (last tested: 1.0.5)
* '''0.9.x''' (last tested: 0.9.4)
* '''0.8.x''' (last tested: 0.8.54)
* '''0.7.x >= 0.7.44''' (last tested: 0.7.68)
View
@@ -3,61 +3,27 @@
# this file is mostly meant to be used by the author himself.
root=`pwd`
-#cd ~/work
version=$1
-opts=$2
-target=$root/work/nginx
-
-if [ ! -d ./buildroot ]; then
- mkdir ./buildroot || exit 1
-fi
-
-cd buildroot || exit 1
-
-if [ ! -s "nginx-$version.tar.gz" ]; then
- if [ -f ~/work/nginx-$version.tar.gz ]; then
- cp ~/work/nginx-$version.tar.gz ./ || exit 1
- else
- wget "http://sysoev.ru/nginx/nginx-$version.tar.gz" -O nginx-$version.tar.gz || exit 1
- fi
-
- tar -xzvf nginx-$version.tar.gz || exit 1
-fi
-
-#tar -xzvf nginx-$version.tar.gz || exit 1
-#cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./ || exit 1
-#patch -p0 < nginx-$version-no_pool.patch || exit 1
-
-cd nginx-$version/ || exit 1
-
-if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
- ./configure --prefix=$target \
- --with-cc-opt="-O0 -fprofile-arcs -ftest-coverage" \
- --with-ld-opt="-fprofile-arcs -ftest-coverage" \
- --without-mail_pop3_module \
- --without-mail_imap_module \
- --without-mail_smtp_module \
- --without-http_upstream_ip_hash_module \
- --without-http_empty_gif_module \
- --without-http_memcached_module \
- --without-http_referer_module \
- --without-http_autoindex_module \
- --without-http_auth_basic_module \
- --without-http_userid_module \
- --add-module=$root/../eval-nginx-module \
- --add-module=$root/../echo-nginx-module \
- --add-module=$root $opts \
- || exit 1
- #--with-debug \
- #--add-module=$root/../ndk-nginx-module \
+force=$2
+
+ngx-build $force $version \
+ --with-cc-opt="-O0 -fprofile-arcs -ftest-coverage" \
+ --with-ld-opt="-fprofile-arcs -ftest-coverage" \
+ --without-mail_pop3_module \
+ --without-mail_imap_module \
+ --without-mail_smtp_module \
+ --without-http_upstream_ip_hash_module \
+ --without-http_empty_gif_module \
+ --without-http_memcached_module \
+ --without-http_referer_module \
+ --without-http_autoindex_module \
+ --without-http_auth_basic_module \
+ --without-http_userid_module \
+ --add-module=$root/../eval-nginx-module \
+ --add-module=$root/../echo-nginx-module \
+ --add-module=$root $opts \
+ || exit 1
+ #--with-debug \
+ #--add-module=$root/../ndk-nginx-module \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
-fi
-if [ -f $target/sbin/nginx ]; then
- rm -f $target/sbin/nginx
-fi
-if [ -f $target/logs/nginx.pid ]; then
- kill `cat $target/logs/nginx.pid`
-fi
-make -j3 && make install
-

0 comments on commit 78286ca

Please sign in to comment.