Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

updated the developer build script to use ngx-build instead.

  • Loading branch information...
commit 7d2a75305d86227fda3ad5c04e1eb1bdb8560c1c 1 parent 47c5323
@agentzh agentzh authored
Showing with 4 additions and 39 deletions.
  1. +4 −39 util/build.sh
View
43 util/build.sh
@@ -2,37 +2,12 @@
# this file is mostly meant to be used by the author himself.
-#ragel -I src -G2 src/ngx_http_memc_response.rl
-
-if [ $? != 0 ]; then
- echo 'Failed to generate the memcached response parser.' 1>&2
- exit 1;
-fi
-
root=`pwd`
-cd ~/work || exit 1
-version=$1
-opts=$2
home=~
+version=$1
+force=$2
-if [ ! -s "nginx-$version.tar.gz" ]; then
- wget "http://sysoev.ru/nginx/nginx-$version.tar.gz" -O nginx-$version.tar.gz || exit 1
- tar -xzvf nginx-$version.tar.gz || exit 1
- if [ "$version" = "0.8.41" ]; then
- cp $root/../no-pool-nginx/nginx-$version-no_pool.patch ./
- patch -p0 < nginx-$version-no_pool.patch || exit 1
- fi
-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
-#patch -p0 < ~/work/nginx-$version-rewrite_phase_fix.patch || exit 1
-
-cd nginx-$version/
-
-if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$root/util/build.sh" -nt Makefile ]]; then
- ./configure --prefix=/opt/nginx \
+ngx-build $force $version \
--with-http_addition_module \
--without-mail_pop3_module \
--without-mail_imap_module \
@@ -47,19 +22,9 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
--add-module=$root $opts \
--add-module=$root/../echo-nginx-module \
--add-module=$root/../memc-nginx-module \
- --with-debug || exit 1
+ --with-debug
#--add-module=$root/../vallery/eval-nginx-module \
#--add-module=$root/../ndk-nginx-module \
#--add-module=$home/work/nginx/nginx_upstream_hash-0.3 \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
-fi
-if [ -f /opt/nginx/sbin/nginx ]; then
- rm -f /opt/nginx/sbin/nginx
-fi
-if [ -f /opt/nginx/logs/nginx.pid ]; then
- kill `cat /opt/nginx/logs/nginx.pid`
-fi
-make -j3
-make install
-
Please sign in to comment.
Something went wrong with that request. Please try again.