nginx: misc/GNUmakefile annotate

annotate misc/GNUmakefile @ 5204:a64c8a5da336

PCRE: retain input pattern for all regular expressions. Previously, input pattern was kept only for regular expressions with named captures, which resulted in error log entries without input pattern for PCRE errors that occured while processing regular expressions without them. Signed-off-by: Piotr Sikora <piotr@cloudflare.com>

author	Piotr Sikora <piotr@cloudflare.com>
date	Thu, 02 May 2013 03:26:36 -0700
parents	864030a4ff2a
children	09dbd363050a

rev	line source
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	1
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
5147 864030a4ff2a Configure: unified nginx version computation constructs. Ruslan Ermilov <ru@nginx.com> parents: 5131 diff changeset	3 \| sed -e 's/^."$.$".*/\1/')
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	4 NGINX = nginx-$(VER)
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	5 TEMP = tmp
4320 b72828fe457f Compute the repository root from the checkout. Ruslan Ermilov <ru@nginx.com> parents: 4264 diff changeset	6 REPO = $(shell svn info \| sed -n 's/^Repository Root: //p')
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	7
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	8 OBJS = objs.msvc8
5065 8b02da13b1d2 Updated OpenSSL used for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 5030 diff changeset	9 OPENSSL = openssl-1.0.1e
4843 762605076600 Updated zlib used for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4842 diff changeset	10 ZLIB = zlib-1.2.7
5004 764833756dcd Updated PCRE used for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4894 diff changeset	11 PCRE = pcre-8.32
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	12
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	13
5131 566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	14 release: export
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	15
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	16 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	17
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	18 # delete incomplete sources
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	19 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	20 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	21 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	22 rm -r $(TEMP)/$(NGINX)/src/os/win32
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	23
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	24 rm -r $(TEMP)/$(NGINX)/src/mysql
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	25
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	26 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	27 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	28 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
3801 569716d0e447 add man page in release tarball and fix man building procedure Igor Sysoev <igor@sysoev.ru> parents: 3717 diff changeset	29 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	30
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	31 $(MAKE) -f docs/GNUmakefile changes
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	32
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	33 rm -r $(TEMP)/$(NGINX)/docs
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	34 rm -r $(TEMP)/$(NGINX)/misc
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	35
704 58bd27d72519 fix bug introduced with snapshot support Igor Sysoev <igor@sysoev.ru> parents: 701 diff changeset	36 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
58bd27d72519 fix bug introduced with snapshot support Igor Sysoev <igor@sysoev.ru> parents: 701 diff changeset	37
701 b2c104777eeb snapshot support Igor Sysoev <igor@sysoev.ru> parents: 681 diff changeset	38
5131 566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	39 export:
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	40 rm -rf $(TEMP)
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	41
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	42 if [ -d .svn ]; then \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	43 svn export -rHEAD . $(TEMP)/$(NGINX); \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	44 else \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	45 hg archive -X '.hg*' $(TEMP)/$(NGINX); \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	46 fi
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	47
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	48
4211 effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	49 RELEASE:
5131 566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	50 if [ -d .svn ]; then \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	51 $(MAKE) -f misc/GNUmakefile RELEASE.svn; \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	52 else \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	53 $(MAKE) -f misc/GNUmakefile RELEASE.hg; \
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	54 fi
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	55
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	56 $(MAKE) -f misc/GNUmakefile release
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	57
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	58
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	59 RELEASE.hg:
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	60 hg ci -m nginx-$(VER)-RELEASE
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	61 hg tag -m "release-$(VER) tag" release-$(VER)
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	62
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	63
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	64 RELEASE.svn:
4211 effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	65 test -d $(TEMP) \|\| mkdir -p $(TEMP)
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	66
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	67 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	68 svn ci -F $(TEMP)/message
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	69
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	70 echo "release-$(VER) tag" > $(TEMP)/message
4320 b72828fe457f Compute the repository root from the checkout. Ruslan Ermilov <ru@nginx.com> parents: 4264 diff changeset	71 svn copy $(REPO)/trunk $(REPO)/tags/release-$(VER) \
4211 effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	72 -F $(TEMP)/message
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	73
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	74 svn up
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	75
effc7962aebe Moving RELEASE target in more safe place. Igor Sysoev <igor@sysoev.ru> parents: 4181 diff changeset	76
4842 d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	77 win32:
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	78 ./auto/configure \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	79 --with-cc=cl \
4894 0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile. Maxim Dounin <mdounin@mdounin.ru> parents: 4843 diff changeset	80 --builddir=$(OBJS) \
4842 d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	81 --with-debug \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	82 --prefix= \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	83 --conf-path=conf/nginx.conf \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	84 --pid-path=logs/nginx.pid \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	85 --http-log-path=logs/access.log \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	86 --error-log-path=logs/error.log \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	87 --sbin-path=nginx.exe \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	88 --http-client-body-temp-path=temp/client_body_temp \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	89 --http-proxy-temp-path=temp/proxy_temp \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	90 --http-fastcgi-temp-path=temp/fastcgi_temp \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	91 --http-scgi-temp-path=temp/scgi_temp \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	92 --http-uwsgi-temp-path=temp/uwsgi_temp \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	93 --with-cc-opt=-DFD_SETSIZE=1024 \
4894 0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile. Maxim Dounin <mdounin@mdounin.ru> parents: 4843 diff changeset	94 --with-pcre=$(OBJS)/lib/$(PCRE) \
0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile. Maxim Dounin <mdounin@mdounin.ru> parents: 4843 diff changeset	95 --with-zlib=$(OBJS)/lib/$(ZLIB) \
4842 d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	96 --with-select_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	97 --with-http_realip_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	98 --with-http_addition_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	99 --with-http_sub_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	100 --with-http_dav_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	101 --with-http_stub_status_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	102 --with-http_flv_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	103 --with-http_mp4_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	104 --with-http_gunzip_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	105 --with-http_gzip_static_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	106 --with-http_random_index_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	107 --with-http_secure_link_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	108 --with-mail \
4894 0156fd6f48fa Style, parentheses instead of braces in misc/GNUMakefile. Maxim Dounin <mdounin@mdounin.ru> parents: 4843 diff changeset	109 --with-openssl=$(OBJS)/lib/$(OPENSSL) \
4842 d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	110 --with-openssl-opt=enable-tlsext \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	111 --with-http_ssl_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	112 --with-mail_ssl_module \
d59fff553840 Helper target "win32" to run configure for win32 builds. Maxim Dounin <mdounin@mdounin.ru> parents: 4779 diff changeset	113 --with-ipv6
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	114
5131 566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	115
566cd32d8bac Misc: support for Mercurial repositories. Maxim Dounin <mdounin@mdounin.ru> parents: 5130 diff changeset	116 zip: export
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	117 rm -f $(NGINX).zip
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	118
5129 96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	119 mkdir -p $(TEMP)/$(NGINX)/docs.new
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	120 mkdir -p $(TEMP)/$(NGINX)/logs
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	121 mkdir -p $(TEMP)/$(NGINX)/temp
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	122
4779 117f3284e0de Removed the need in Perl to generate ZIP archive of nginx/Windows. Ruslan Ermilov <ru@nginx.com> parents: 4774 diff changeset	123 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	124
5129 96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	125 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)/docs.new
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	126 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)/docs.new
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	127 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	128
5129 96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	129 rm -r $(TEMP)/$(NGINX)/docs
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	130 mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	131
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	132 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	133
5129 96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	134 $(MAKE) -f docs/GNUmakefile changes
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	135 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	136
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	137 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	138 $(TEMP)/$(NGINX)/docs/OpenSSL.LICENSE
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	139
2871 c7fe4b9118d2 fix "make zip", the bug has been introduced in r2841 Igor Sysoev <igor@sysoev.ru> parents: 2734 diff changeset	140 cp -p $(OBJS)/lib/$(PCRE)/LICENCE \
c7fe4b9118d2 fix "make zip", the bug has been introduced in r2841 Igor Sysoev <igor@sysoev.ru> parents: 2734 diff changeset	141 $(TEMP)/$(NGINX)/docs/PCRE.LICENCE
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	142
4779 117f3284e0de Removed the need in Perl to generate ZIP archive of nginx/Windows. Ruslan Ermilov <ru@nginx.com> parents: 4774 diff changeset	143 sed -ne '/^ (C) 1995-20/,/^ jloup@gzip\.org/p' \
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	144 $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	145 > $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	146
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	147 touch -r $(OBJS)/lib/$(ZLIB)/README \
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	148 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	149
5129 96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	150 rm -r $(TEMP)/$(NGINX)/auto
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	151 rm -r $(TEMP)/$(NGINX)/misc
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	152 rm -r $(TEMP)/$(NGINX)/src
96ee76fda991 Misc: switch to single export operation in "zip" target. Maxim Dounin <mdounin@mdounin.ru> parents: 5065 diff changeset	153
2725 d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	154 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	155
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	156
d43d73277c5c Win32 master/workers model Igor Sysoev <igor@sysoev.ru> parents: 1662 diff changeset	157 icons: src/os/win32/nginx.ico
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	158
2734 37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	159 # 48x48, 32x32 and 16x16 icons
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	160
2734 37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	161 src/os/win32/nginx.ico: src/os/win32/nginx_icon48.xpm \
37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	162 src/os/win32/nginx_icon32.xpm \
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	163 src/os/win32/nginx_icon16.xpm
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	164
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	165 test -d $(TEMP) \|\| mkdir $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	166
2734 37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	167 xpmtoppm --alphaout=$(TEMP)/nginx48.pbm \
37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	168 src/os/win32/nginx_icon48.xpm > $(TEMP)/nginx48.ppm
37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	169
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	170 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	171 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	172
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	173 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	174 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	175
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	176 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
2734 37580bd13ca5 add 48x48 icon Igor Sysoev <igor@sysoev.ru> parents: 2725 diff changeset	177 $(TEMP)/nginx48.ppm $(TEMP)/nginx48.pbm \
681 7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	178 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import Igor Sysoev <igor@sysoev.ru> parents: diff changeset	179 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm

Mercurial > hg > nginx

annotate misc/GNUmakefile @ 5204:a64c8a5da336