Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 9065209eecaeaeb7debbe1b6199d52c9893ed85d 1 parent 98c7907
@agentzh agentzh authored
Showing with 4 additions and 46 deletions.
  1. +4 −46 util/build.sh
View
50 util/build.sh
@@ -3,38 +3,11 @@
# this file is mostly meant to be used by the author himself.
root=`pwd`
-version=${1:-1.0.5}
+version=$1
home=~
-#opts=$2
-target=$root/work/nginx
+force=$2
-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
- cp nginx-$version.tar.gz ~/work/ || 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
-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 \
+ngx-build $force $version \
--with-cc-opt="-O1" \
--with-ld-opt="-Wl,-rpath,/opt/drizzle/lib:/opt/pg9/lib" \
--without-mail_pop3_module \
@@ -57,26 +30,11 @@ if [[ "$BUILD_CLEAN" -eq 1 || ! -f Makefile || "$root/config" -nt Makefile || "$
--add-module=$root/../drizzle-nginx-module \
--add-module=$root/../form-input-nginx-module \
--add-module=$root/../postgres-nginx-module \
- --with-debug \
- || exit 1
+ --with-debug
#--add-module=$root/../lua-nginx-module \
#--add-module=$home/work/ngx_http_auth_request-0.1 #\
#--with-rtsig_module
#--with-cc-opt="-g3 -O0"
#--add-module=$root/../echo-nginx-module \
#--without-http_ssi_module # we cannot disable ssi because echo_location_async depends on it (i dunno why?!)
- if [ $? -ne 0 ]; then
- echo "Failed to configure"
- exit 1
- fi
-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
Please sign in to comment.
Something went wrong with that request. Please try again.