Klaus Demo nginx / f064449
Merge of r5130, r5131, r5132: support for Mercurial repositories. *) Misc: switch to single export operation in "zip" target. While exporting parts of the tree might be better in some cases, it is awfully slow overseas, and also requires unlocking ssh key multiple times. Exporting the whole repo and removing directories not needed for zip is faster here. It is also a required step before we can switch to Mercurial. *) Misc: removed unused "snapshot" target. *) Misc: support for Mercurial repositories. Maxim Dounin 6 years ago
1 changed file(s) with 39 addition(s) and 43 deletion(s). Raw diff Collapse all Expand all
1010 PCRE = pcre-8.32
1111
1212
13 release:
14 rm -rf $(TEMP)
15
16 svn export -rHEAD . $(TEMP)/$(NGINX)
13 release: export
1714
1815 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
1916
3835 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
3936
4037
38 export:
39 rm -rf $(TEMP)
40
41 if [ -d .svn ]; then \
42 svn export -rHEAD . $(TEMP)/$(NGINX); \
43 else \
44 hg archive -X '.hg*' $(TEMP)/$(NGINX); \
45 fi
46
47
4148 RELEASE:
49 if [ -d .svn ]; then \
50 $(MAKE) -f misc/GNUmakefile RELEASE.svn; \
51 else \
52 $(MAKE) -f misc/GNUmakefile RELEASE.hg; \
53 fi
54
55 $(MAKE) -f misc/GNUmakefile release
56
57
58 RELEASE.hg:
59 hg ci -m nginx-$(VER)-RELEASE
60 hg tag -m "release-$(VER) tag" release-$(VER)
61
62
63 RELEASE.svn:
4264 test -d $(TEMP) || mkdir -p $(TEMP)
4365
4466 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
5173
5274 svn up
5375
54 $(MAKE) -f misc/GNUmakefile release
55
56
57 snapshot:
58 rm -rf $(TEMP)
59
60 mkdir -p $(TEMP)
61 svn export . $(TEMP)/$(NGINX)
62
63 mv $(TEMP)/$(NGINX)/auto/configure $(TEMP)/$(NGINX)
64
65 # delete incomplete sources
66 rm $(TEMP)/$(NGINX)/src/event/ngx_event_acceptex.c
67 rm $(TEMP)/$(NGINX)/src/event/ngx_event_connectex.c
68 rm $(TEMP)/$(NGINX)/src/event/modules/ngx_iocp_module.*
69 rm -r $(TEMP)/$(NGINX)/src/os/win32
70
71 rm -r $(TEMP)/$(NGINX)/src/mysql
72
73 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)
74 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)
75 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
76 mv $(TEMP)/$(NGINX)/docs/man $(TEMP)/$(NGINX)
77
78 $(MAKE) -f docs/GNUmakefile changes
79
80 rm -r $(TEMP)/$(NGINX)/docs
81 rm -r $(TEMP)/$(NGINX)/misc
82
83 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
8476
8577 win32:
8678 ./auto/configure \
119111 --with-mail_ssl_module \
120112 --with-ipv6
121113
122 zip:
123 rm -rf $(TEMP)
114
115 zip: export
124116 rm -f $(NGINX).zip
125117
126 mkdir -p $(TEMP)/$(NGINX)/docs
118 mkdir -p $(TEMP)/$(NGINX)/docs.new
127119 mkdir -p $(TEMP)/$(NGINX)/logs
128120 mkdir -p $(TEMP)/$(NGINX)/temp
129121
130 svn export -rHEAD conf $(TEMP)/$(NGINX)/conf/
131122 sed -i '' -e "s/$$/`printf '\r'`/" $(TEMP)/$(NGINX)/conf/*
132123
133 svn export -rHEAD contrib $(TEMP)/$(NGINX)/contrib/
134 svn export -rHEAD docs/html $(TEMP)/$(NGINX)/html/
124 mv $(TEMP)/$(NGINX)/docs/text/LICENSE $(TEMP)/$(NGINX)/docs.new
125 mv $(TEMP)/$(NGINX)/docs/text/README $(TEMP)/$(NGINX)/docs.new
126 mv $(TEMP)/$(NGINX)/docs/html $(TEMP)/$(NGINX)
135127
136 $(MAKE) -f docs/GNUmakefile changes
128 rm -r $(TEMP)/$(NGINX)/docs
129 mv $(TEMP)/$(NGINX)/docs.new $(TEMP)/$(NGINX)/docs
137130
138131 cp -p $(OBJS)/nginx.exe $(TEMP)/$(NGINX)
139132
140 cp -p docs/text/LICENSE $(TEMP)/$(NGINX)/docs/
141 cp -p docs/text/README $(TEMP)/$(NGINX)/docs/
133 $(MAKE) -f docs/GNUmakefile changes
142134 mv $(TEMP)/$(NGINX)/CHANGES* $(TEMP)/$(NGINX)/docs/
143135
144136 cp -p $(OBJS)/lib/$(OPENSSL)/LICENSE \
153145
154146 touch -r $(OBJS)/lib/$(ZLIB)/README \
155147 $(TEMP)/$(NGINX)/docs/zlib.LICENSE
148
149 rm -r $(TEMP)/$(NGINX)/auto
150 rm -r $(TEMP)/$(NGINX)/misc
151 rm -r $(TEMP)/$(NGINX)/src
156152
157153 cd $(TEMP) && zip -r ../$(NGINX).zip $(NGINX)
158154