aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile37
1 files changed, 2 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 6040b7a..24ee8e0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,6 @@ PACKAGE = desktop-common-data
NAME = desktop-common-data
TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
mandir=/usr/share/man
-SVNROOT = svn+ssh://svn.mageia.org/svn/soft/$(PACKAGE)
menus: applications.menu kde-applications.menu
@@ -28,12 +27,6 @@ checktag:
echo not all changes are committed, aborting ; \
exit 1 ; \
fi ; \
- if [ -e ".git/svn" ]; then \
- if ! git diff --quiet HEAD..trunk ; then \
- echo not all changes were pushed to SVN repository ; \
- exit 1 ; \
- fi ; \
- fi ; \
fi
@if [ "x$(VERSION)" == "x" -o "x$(RELEASE)" = "x" ]; then \
echo usage is "make VERSION=version_number RELEASE=release_number dist" ; \
@@ -48,30 +41,11 @@ clean:
dist: menus checktag clean changelog
rm -rf ../$(NAME)-$(VERSION)*.tar* $(NAME)-$(VERSION)
- @if [ -e ".svn" ]; then \
- $(MAKE) dist-svn; \
- elif [ -e ".git" ]; then \
- $(MAKE) dist-git; \
- else \
- echo "Unknown SCM (not SVN nor GIT)";\
- exit 1; \
- fi;
- $(info $(NAME)-$(VERSION).tar.bz2 is ready)
-
-dist-git:
@git archive --prefix=$(NAME)-$(VERSION)/ HEAD | xz >../$(NAME)-$(VERSION).tar.xz;
-
-dist-svn:
- svn export -q -rBASE . $(NAME)-$(VERSION)
- tar cfJ ../$(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
- rm -rf $(NAME)-$(VERSION)
+ $(info $(NAME)-$(VERSION).tar.bz2 is ready)
tag: checktag
- @if [ -e ".svn" ]; then \
- svn copy $(SVNROOT)/trunk $(SVNROOT)/tags/$(TAG) -m "$(TAG)"; \
- elif [ -e ".git" -a -e ".git/svn" ]; then \
- git svn tag $(TAG); \
- fi;
+ git tag $(TAG); \
.PHONY: ChangeLog log changelog
@@ -79,19 +53,12 @@ log: ChangeLog
changelog: ChangeLog
-#svn2cl is available in our contrib.
ChangeLog:
@if test -d "$$PWD/.git"; then \
../common/gitlog-to-changelog | sed -e '/\tgit-svn-id:.*/d' > $@.tmp \
&& mv -f $@.tmp $@ \
&& git commit ChangeLog -m 'generated changelog' \
- && if [ -e ".git/svn" ]; then \
- git svn dcommit ; \
- fi \
|| (rm -f $@.tmp; \
echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
(test -f $@ || echo git-log is required to generate this file >> $@)); \
- else \
- svn2cl --accum ; \
- rm -f *.bak; \
fi;