Changeset 1495 for trunk/Makefile.am


Ignore:
Timestamp:
Aug 27, 2012, 6:06:43 AM (8 years ago)
Author:
Peter Johansson
Message:

merge patch release 0.9.6 into trunk

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/Makefile.am

    r1470 r1495  
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    66# Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    7 # Copyright (C) 2009, 2010, 2011 Peter Johansson
     7# Copyright (C) 2009, 2010, 2011, 2012 Peter Johansson
    88#
    99# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    117117  @echo "creating $@"
    118118
     119STABLE_VERSION = $(SVNDIGEST_MAJOR_VERSION).$(SVNDIGEST_MINOR_VERSION)
     120STABLE_BRANCH = ^/branches/$(STABLE_VERSION)-stable
     121
    119122# create a tag from current stable branch; depends on check-version to
    120123# ensure that version is macro.minor.micro (no pre suffix), that wc is
    121124# pristine and updated.
    122125svn-tag: check-version check-svn-diff
    123   svn copy \
    124   ^/branches/$(SVNDIGEST_MAJOR_VERSION).$(SVNDIGEST_MINOR_VERSION)-stable\
    125   ^/tags/$(VERSION) -m "tagging version $(VERSION)"
     126  svn copy $(STABLE_BRANCH) ^/tags/$(VERSION) \
     127  -m "tagging version $(VERSION)"
     128
     129# create a stable-branch from trunk
     130svn-stable-branch: check-svn-diff all
     131  svn copy ^/trunk $(STABLE_BRANCH) \
     132  -m "New stable branch $(STABLE_VERSION)" \
     133  && svn co $(STABLE_BRANCH) ../svndigest-$(STABLE_VERSION).x \
     134  && bin/svndigest-copy-cache -v -t ../svndigest-$(STABLE_VERSION).x
    126135
    127136syntax-check: assert-header-without-use \
     
    144153  grep -LE "[^ \t\(=]errno" $$files | grep $(srcdir) && \
    145154  { echo "$@: in files listed above"; exit 1; } || :;
    146 
Note: See TracChangeset for help on using the changeset viewer.