annotate misc/GNUmakefile @ 704:58bd27d72519

fix bug introduced with snapshot support
author Igor Sysoev <igor@sysoev.ru>
date Mon, 18 Sep 2006 12:42:53 +0000
parents b2c104777eeb
children a452a0e13539
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 VER= $(shell grep NGINX_VER src/core/nginx.h \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
3 | sed -e 's%^.*\"nginx/\(.*\)\"%\1%')
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4 NGINX= nginx-$(VER)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5 TEMP= tmp
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 release:
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 rm -rf $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11 svn export -rHEAD . $(TEMP)/$(NGINX)
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 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
14
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15 # delete incomplete sources
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
16 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
17 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
18 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
19 rm -r $(TEMP)/$(NGINX)/src/os/win32
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21 rm $(TEMP)/$(NGINX)/src/core/ngx_slab.*
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 rm $(TEMP)/$(NGINX)/src/core/ngx_resolver.*
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 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
27
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
28 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
29 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
31
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
32 $(MAKE) -f docs/GNUmakefile changes
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 rm -r $(TEMP)/$(NGINX)/docs
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35 rm -r $(TEMP)/$(NGINX)/misc
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36
704
58bd27d72519 fix bug introduced with snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 701
diff changeset
37 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
38
701
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
39
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
40 snapshot:
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
41 rm -rf $(TEMP)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
42
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
43 mkdir -p $(TEMP)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
44 svn export . $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
45
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
46 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
47
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
48 # delete incomplete sources
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
49 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
50 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
51 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
52 rm -r $(TEMP)/$(NGINX)/src/os/win32
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
53
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
54 rm $(TEMP)/$(NGINX)/src/core/ngx_slab.*
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
55 rm $(TEMP)/$(NGINX)/src/core/ngx_resolver.*
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
56
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
57 rm -r $(TEMP)/$(NGINX)/src/mysql
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
58
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
59 rm $(TEMP)/$(NGINX)/src/http/modules/ngx_http_status_module.c
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
60
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
61 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
62 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
63 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
64
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
65 $(MAKE) -f docs/GNUmakefile changes
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
66
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
67 rm -r $(TEMP)/$(NGINX)/docs
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
68 rm -r $(TEMP)/$(NGINX)/misc
b2c104777eeb snapshot support
Igor Sysoev <igor@sysoev.ru>
parents: 681
diff changeset
69
681
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
70 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
71
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
72
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
73 icons: src/os/win32/nginx.ico src/os/win32/nginx_tray.ico
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
74
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
75 # 32x32 and 16x16 icons
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
76
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
77 src/os/win32/nginx.ico: src/os/win32/nginx_icon32.xpm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
78 src/os/win32/nginx_icon16.xpm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
79
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
80 test -d $(TEMP) || mkdir $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
81
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
82 xpmtoppm --alphaout=$(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
83 src/os/win32/nginx_icon32.xpm > $(TEMP)/nginx32.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
85 xpmtoppm --alphaout=$(TEMP)/nginx16.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
86 src/os/win32/nginx_icon16.xpm > $(TEMP)/nginx16.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
87
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
88 ppmtowinicon -output src/os/win32/nginx.ico -andpgms \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
89 $(TEMP)/nginx32.ppm $(TEMP)/nginx32.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
90 $(TEMP)/nginx16.ppm $(TEMP)/nginx16.pbm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
91
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
92 # tray icon
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
93
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
94 src/os/win32/nginx_tray.ico: src/os/win32/nginx_tray.xpm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
95
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
96 test -d $(TEMP) || mkdir $(TEMP)
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
97
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
98 xpmtoppm --alphaout=$(TEMP)/nginx_tray.pbm \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
99 src/os/win32/nginx_tray.xpm > $(TEMP)/nginx_tray.ppm
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
100
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
101 ppmtowinicon -output src/os/win32/nginx_tray.ico -andpgms \
7e24168b0853 nginx-0.4.0-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
102 $(TEMP)/nginx_tray.ppm $(TEMP)/nginx_tray.pbm