diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2013-04-25 17:41:45 +0400 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2013-04-25 17:41:45 +0400 |
| commit | 26dc3f37c33bbeff57ffee46c0310848862e0900 (patch) | |
| tree | 70bff5a65e9375a2b1aeba4527c44581a19abbf8 | |
| parent | 307b61771284a76d431e253dfcc9c1f7ec73e94c (diff) | |
| download | nginx-26dc3f37c33bbeff57ffee46c0310848862e0900.tar.gz | |
Removed vestiges of SVN.
| -rw-r--r-- | misc/GNUmakefile | 31 | ||||
| -rw-r--r-- | misc/README | 3 |
2 files changed, 2 insertions, 32 deletions
diff --git a/misc/GNUmakefile b/misc/GNUmakefile index 31fe24cea..6be2ec524 100644 --- a/misc/GNUmakefile +++ b/misc/GNUmakefile @@ -3,7 +3,6 @@ VER = $(shell grep 'define NGINX_VERSION' src/core/nginx.h \ | sed -e 's/^.*"\(.*\)".*/\1/') NGINX = nginx-$(VER) TEMP = tmp -REPO = $(shell svn info | sed -n 's/^Repository Root: //p') OBJS = objs.msvc8 OPENSSL = openssl-1.0.1e @@ -38,40 +37,14 @@ release: export export: rm -rf $(TEMP) - - if [ -d .svn ]; then \ - svn export -rHEAD . $(TEMP)/$(NGINX); \ - else \ - hg archive -X '.hg*' $(TEMP)/$(NGINX); \ - fi + hg archive -X '.hg*' $(TEMP)/$(NGINX) RELEASE: - if [ -d .svn ]; then \ - $(MAKE) -f misc/GNUmakefile RELEASE.svn; \ - else \ - $(MAKE) -f misc/GNUmakefile RELEASE.hg; \ - fi - - $(MAKE) -f misc/GNUmakefile release - - -RELEASE.hg: hg ci -m nginx-$(VER)-RELEASE hg tag -m "release-$(VER) tag" release-$(VER) - -RELEASE.svn: - test -d $(TEMP) || mkdir -p $(TEMP) - - echo "nginx-$(VER)-RELEASE" > $(TEMP)/message - svn ci -F $(TEMP)/message - - echo "release-$(VER) tag" > $(TEMP)/message - svn copy $(REPO)/trunk $(REPO)/tags/release-$(VER) \ - -F $(TEMP)/message - - svn up + $(MAKE) -f misc/GNUmakefile release win32: diff --git a/misc/README b/misc/README index 6522aba4f..79746dee4 100644 --- a/misc/README +++ b/misc/README @@ -1,7 +1,4 @@ -GNUmakefile, in svn it is available since 0.4.0 only. - - make -f misc/GNUmakefile release the required tools: |