comparison misc/GNUmakefile @ 5212:09dbd363050a

Removed vestiges of SVN.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 25 Apr 2013 17:41:45 +0400
parents 864030a4ff2a
children 21e07bf09dd6
comparison
equal deleted inserted replaced
5211:ecd762770729 5212:09dbd363050a
1 1
2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ 2 VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \
3 | sed -e 's/^.*"\(.*\)".*/\1/') 3 | sed -e 's/^.*"\(.*\)".*/\1/')
4 NGINX = nginx-$(VER) 4 NGINX = nginx-$(VER)
5 TEMP = tmp 5 TEMP = tmp
6 REPO = $(shell svn info | sed -n 's/^Repository Root: //p')
7 6
8 OBJS = objs.msvc8 7 OBJS = objs.msvc8
9 OPENSSL = openssl-1.0.1e 8 OPENSSL = openssl-1.0.1e
10 ZLIB = zlib-1.2.7 9 ZLIB = zlib-1.2.7
11 PCRE = pcre-8.32 10 PCRE = pcre-8.32
36 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX) 35 tar -c -z -f $(NGINX).tar.gz --directory $(TEMP) $(NGINX)
37 36
38 37
39 export: 38 export:
40 rm -rf $(TEMP) 39 rm -rf $(TEMP)
41 40 hg archive -X '.hg*' $(TEMP)/$(NGINX)
42 if [ -d .svn ]; then \
43 svn export -rHEAD . $(TEMP)/$(NGINX); \
44 else \
45 hg archive -X '.hg*' $(TEMP)/$(NGINX); \
46 fi
47 41
48 42
49 RELEASE: 43 RELEASE:
50 if [ -d .svn ]; then \
51 $(MAKE) -f misc/GNUmakefile RELEASE.svn; \
52 else \
53 $(MAKE) -f misc/GNUmakefile RELEASE.hg; \
54 fi
55
56 $(MAKE) -f misc/GNUmakefile release
57
58
59 RELEASE.hg:
60 hg ci -m nginx-$(VER)-RELEASE 44 hg ci -m nginx-$(VER)-RELEASE
61 hg tag -m "release-$(VER) tag" release-$(VER) 45 hg tag -m "release-$(VER) tag" release-$(VER)
62 46
63 47 $(MAKE) -f misc/GNUmakefile release
64 RELEASE.svn:
65 test -d $(TEMP) || mkdir -p $(TEMP)
66
67 echo "nginx-$(VER)-RELEASE" > $(TEMP)/message
68 svn ci -F $(TEMP)/message
69
70 echo "release-$(VER) tag" > $(TEMP)/message
71 svn copy $(REPO)/trunk $(REPO)/tags/release-$(VER) \
72 -F $(TEMP)/message
73
74 svn up
75 48
76 49
77 win32: 50 win32:
78 ./auto/configure \ 51 ./auto/configure \
79 --with-cc=cl \ 52 --with-cc=cl \