Author: mdounin
Date: 2012-09-24 18:37:14 +0000 (Mon, 24 Sep 2012)
New Revision: 4850
URL: http://trac.nginx.org/nginx/changeset/4850/nginx

Log:
Merge of r4779, r4840, r4843, r4844: win32 changes.

*) Fixed build with Visual Studio 2005 Express.

It is available via winetricks which makes it still usable, and has
an old crtdefs.h which uses _CRT_SECURE_NO_DEPRECATE instead of
_CRT_SECURE_NO_WARNINGS to suppress warnings.

Reported by HAYASHI Kentaro,
http://mailman.nginx.org/pipermail/nginx-devel/2012-August/002542.html

*) Configure: provide inflate() when building zlib on win32.

*) Configure: fixed make macros to use parentheses instead of braces.
Parentheses are more portable, in particular they are understood by
nmake while braces aren't.

*) Helper target "win32" to run configure for win32 builds.

*) Updated zlib used for win32 builds.


Modified:
branches/stable-1.2/
branches/stable-1.2/auto/lib/zlib/makefile.bcc
branches/stable-1.2/auto/lib/zlib/makefile.msvc
branches/stable-1.2/auto/lib/zlib/makefile.owc
branches/stable-1.2/misc/GNUmakefile
branches/stable-1.2/src/os/win32/ngx_win32_config.h

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2 2012-09-24 18:37:14 UTC (rev 4850)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4778,4780,4782-4783,4824,4830-4832,4834
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4783,4824,4830-4832,4834,4840,4843-4844
\ No newline at end of property
Modified: branches/stable-1.2/auto/lib/zlib/makefile.bcc
===================================================================
--- branches/stable-1.2/auto/lib/zlib/makefile.bcc 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2/auto/lib/zlib/makefile.bcc 2012-09-24 18:37:14 UTC (rev 4850)
@@ -8,8 +8,10 @@
zlib.lib:
cd $(ZLIB)

- bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c \
- compress.c
+ bcc32 -c $(CFLAGS) adler32.c crc32.c deflate.c \
+ trees.c zutil.c compress.c \
+ inflate.c inffast.c inftrees.c

tlib zlib.lib +adler32.obj +crc32.obj +deflate.obj \
- +trees.obj +zutil.obj +compress.obj
+ +trees.obj +zutil.obj +compress.obj \
+ +inflate.obj +inffast.obj +inftrees.obj

Modified: branches/stable-1.2/auto/lib/zlib/makefile.msvc
===================================================================
--- branches/stable-1.2/auto/lib/zlib/makefile.msvc 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2/auto/lib/zlib/makefile.msvc 2012-09-24 18:37:14 UTC (rev 4850)
@@ -8,7 +8,10 @@
zlib.lib:
cd $(ZLIB)

- cl -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c compress.c
+ cl -c $(CFLAGS) adler32.c crc32.c deflate.c \
+ trees.c zutil.c compress.c \
+ inflate.c inffast.c inftrees.c

link -lib -out:zlib.lib adler32.obj crc32.obj deflate.obj \
- trees.obj zutil.obj compress.obj
+ trees.obj zutil.obj compress.obj \
+ inflate.obj inffast.obj inftrees.obj

Modified: branches/stable-1.2/auto/lib/zlib/makefile.owc
===================================================================
--- branches/stable-1.2/auto/lib/zlib/makefile.owc 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2/auto/lib/zlib/makefile.owc 2012-09-24 18:37:14 UTC (rev 4850)
@@ -9,6 +9,6 @@
cd $(ZLIB)

wcl386 -c $(CFLAGS) adler32.c crc32.c deflate.c trees.c zutil.c &
- compress.c
+ compress.c inflate.c inffast.c inftrees.c
wlib -n zlib.lib adler32.obj crc32.obj deflate.obj trees.obj &
- zutil.obj compress.obj
+ zutil.obj compress.obj inflate.obj inffast.obj inftrees.obj

Modified: branches/stable-1.2/misc/GNUmakefile
===================================================================
--- branches/stable-1.2/misc/GNUmakefile 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2/misc/GNUmakefile 2012-09-24 18:37:14 UTC (rev 4850)
@@ -7,7 +7,7 @@

OBJS = objs.msvc8
OPENSSL = openssl-1.0.1c
-ZLIB = zlib-1.2.5
+ZLIB = zlib-1.2.7
PCRE = pcre-8.31


@@ -83,6 +83,43 @@

tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)

+win32:
+ ./auto/configure \
+ --with-cc=cl \
+ --builddir=${OBJS} \
+ --with-debug \
+ --prefix= \
+ --conf-path=conf/nginx.conf \
+ --pid-path=logs/nginx.pid \
+ --http-log-path=logs/access.log \
+ --error-log-path=logs/error.log \
+ --sbin-path=nginx.exe \
+ --http-client-body-temp-path=temp/client_body_temp \
+ --http-proxy-temp-path=temp/proxy_temp \
+ --http-fastcgi-temp-path=temp/fastcgi_temp \
+ --http-scgi-temp-path=temp/scgi_temp \
+ --http-uwsgi-temp-path=temp/uwsgi_temp \
+ --with-cc-opt=-DFD_SETSIZE=1024 \
+ --with-pcre=${OBJS}/lib/${PCRE} \
+ --with-zlib=${OBJS}/lib/${ZLIB} \
+ --with-select_module \
+ --with-http_realip_module \
+ --with-http_addition_module \
+ --with-http_sub_module \
+ --with-http_dav_module \
+ --with-http_stub_status_module \
+ --with-http_flv_module \
+ --with-http_mp4_module \
+ --with-http_gunzip_module \
+ --with-http_gzip_static_module \
+ --with-http_random_index_module \
+ --with-http_secure_link_module \
+ --with-mail \
+ --with-openssl=${OBJS}/lib/${OPENSSL} \
+ --with-openssl-opt=enable-tlsext \
+ --with-http_ssl_module \
+ --with-mail_ssl_module \
+ --with-ipv6

zip:
rm -rf $(TEMP)

Modified: branches/stable-1.2/src/os/win32/ngx_win32_config.h
===================================================================
--- branches/stable-1.2/src/os/win32/ngx_win32_config.h 2012-09-24 18:34:04 UTC (rev 4849)
+++ branches/stable-1.2/src/os/win32/ngx_win32_config.h 2012-09-24 18:37:14 UTC (rev 4850)
@@ -18,6 +18,7 @@

/* enable getenv() and gmtime() in msvc8 */
#define _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_DEPRECATE

/*
* we need to include <windows.h> explicitly before <winsock2.h> because

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel