diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-02 01:01:11 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-02 01:01:11 +0000 |
commit | 907b53f827a5202f4f0928ef98bedc6ff5958936 (patch) | |
tree | 975b2dabe30d1a8c86307711c15c13d63c258135 /Makefile | |
parent | 73f1a2863ebe21859bd73208fdd3ac3e4f124729 (diff) |
Merged revisions 7265-7266,7268-7275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7265 | oej | 2005-12-01 17:18:14 -0600 (Thu, 01 Dec 2005) | 2 lines
Changing bug report address to the Asterisk issue tracker
........
r7266 | kpfleming | 2005-12-01 17:18:29 -0600 (Thu, 01 Dec 2005) | 3 lines
Makefile 'update' target now supports updating from Subversion repositories (issue #5875)
remove support for 'patches' subdirectory, it's no longer useful
........
r7268 | kpfleming | 2005-12-01 17:34:58 -0600 (Thu, 01 Dec 2005) | 2 lines
ensure channel's scheduling context is freed (issue #5788)
........
r7269 | kpfleming | 2005-12-01 17:49:44 -0600 (Thu, 01 Dec 2005) | 2 lines
don't block waiting for the Festival server forever when it goes away (issue #5882)
........
r7270 | kpfleming | 2005-12-01 18:26:12 -0600 (Thu, 01 Dec 2005) | 2 lines
allow variables to exist on both 'halves' of the Local channel (issue #5810)
........
r7271 | kpfleming | 2005-12-01 18:28:48 -0600 (Thu, 01 Dec 2005) | 2 lines
protect agent_bridgedchannel() from segfaulting when there is no bridged channel (issue #5879)
........
r7272 | kpfleming | 2005-12-01 18:39:00 -0600 (Thu, 01 Dec 2005) | 3 lines
properly handle password changes when mailbox is last line of config file and not followed by a newline (issue #5870)
reformat password changing code to conform to coding guidelines (issue #5870)
........
r7273 | kpfleming | 2005-12-01 18:42:40 -0600 (Thu, 01 Dec 2005) | 2 lines
allow previous context-searching behavior to be used if desired (issue #5899)
........
r7274 | kpfleming | 2005-12-01 18:51:15 -0600 (Thu, 01 Dec 2005) | 2 lines
inherit channel variables into channels created by Page() application (issue #5888)
........
r7275 | oej | 2005-12-01 18:52:13 -0600 (Thu, 01 Dec 2005) | 2 lines
Bug #5907. Improve SIP INFO DTMF debugging output. (1.2 & Trunk)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7276 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 76 |
1 files changed, 10 insertions, 66 deletions
@@ -592,17 +592,16 @@ datafiles: all mkdir -p $(DESTDIR)$(AGI_DIR) update: - @if [ -d CVS ]; then \ - if [ -f patches/.applied ]; then \ - patches=`cat patches/.applied`; \ - fi; \ - if [ ! -z "$$patches" ]; then \ - for x in $$patches; do \ - echo "Unapplying $$x..."; \ - patch -R -p0 < patches/$$x; \ - done; \ - rm -f patches/.applied; \ + @if [ -d .svn ]; then \ + echo "Updating from Subversion..." ; \ + svn update | tee update.out; \ + rm -f .version; \ + if [ `grep -c ^C update.out` -gt 0 ]; then \ + echo ; echo "The following files have conflicts:" ; \ + grep ^C update.out | cut -b4- ; \ fi ; \ + rm -f update.out; \ + elif [ -d CVS ]; then \ echo "Updating from CVS..." ; \ cvs -q -z3 update -Pd | tee update.out; \ rm -f .version; \ @@ -611,19 +610,8 @@ update: grep ^C update.out | cut -d' ' -f2- ; \ fi ; \ rm -f update.out; \ - if [ ! -z "$$patches" ]; then \ - for x in $$patches; do \ - if [ -f patches/$$x ]; then \ - echo "Applying patch $$x..."; \ - patch -p0 < patches/$$x; \ - echo $$x >> patches/.applied; \ - else \ - echo "Patch $$x no longer relevant"; \ - fi; \ - done; \ - fi; \ else \ - echo "Not CVS"; \ + echo "Not under version control"; \ fi NEWHEADERS=$(notdir $(wildcard include/asterisk/*.h)) @@ -911,47 +899,3 @@ cleantest: if cmp -s .cleancount .lastclean ; then echo ; else \ $(MAKE) clean; cp -f .cleancount .lastclean;\ fi - -patchlist: - @echo "Experimental Patches:" - @for x in patches/*; do \ - patch=`basename $$x`; \ - if [ "$$patch" = "CVS" ]; then \ - continue; \ - fi; \ - if grep -q ^$$patch$$ patches/.applied; then \ - echo "$$patch (applied)"; \ - else \ - echo "$$patch (available)"; \ - fi; \ - done - -apply: - @if [ -z "$(PATCH)" ]; then \ - echo "Usage: make PATCH=<patchname> apply"; \ - elif grep -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \ - echo "Patch $(PATCH) is already applied"; \ - elif [ -f "patches/$(PATCH)" ]; then \ - echo "Applying patch $(PATCH)"; \ - patch -p0 < patches/$(PATCH); \ - echo "$(PATCH)" >> patches/.applied; \ - else \ - echo "No such patch $(PATCH) in patches directory"; \ - fi - -unapply: - @if [ -z "$(PATCH)" ]; then \ - echo "Usage: make PATCH=<patchname> unapply"; \ - elif grep -v -q ^$(PATCH)$$ patches/.applied 2>/dev/null; then \ - echo "Patch $(PATCH) is not applied"; \ - elif [ -f "patches/$(PATCH)" ]; then \ - echo "Un-applying patch $(PATCH)"; \ - patch -p0 -R < patches/$(PATCH); \ - rm -f patches/.tmpapplied || :; \ - mv patches/.applied patches/.tmpapplied; \ - cat patches/.tmpapplied | grep -v ^$(PATCH)$$ > patches/.applied; \ - rm -f patches/.tmpapplied; \ - else \ - echo "No such patch $(PATCH) in patches directory"; \ - fi - |