Skip to content

Commit

Permalink
Removed vestiges of SVN.
Browse files Browse the repository at this point in the history
  • Loading branch information
mdocguard committed Apr 25, 2013
1 parent 330ebdc commit 1f415d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 32 deletions.
31 changes: 2 additions & 29 deletions misc/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions misc/README
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@

GNUmakefile, in svn it is available since 0.4.0 only.


make -f misc/GNUmakefile release

the required tools:
Expand Down

0 comments on commit 1f415d6

Please sign in to comment.