bkruse: branch 2.0 r3627 - in /branches/2.0: Makefile requests.txt

[SVN commits to the Asterisk-GUI project]

Author: bkruse
Date: Wed Aug  6 21:38:53 2008
New Revision: 3627

URL: http://svn.digium.com/view/asterisk-gui?view=rev&rev=3627
Log:
Restoring the 'make update' functionality of 1.0
into 2.0

Modified:
    branches/2.0/Makefile
    branches/2.0/requests.txt

Modified: branches/2.0/Makefile
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/Makefile?view=diff&rev=3627&r1=3626&r2=3627
==============================================================================
--- branches/2.0/Makefile (original)
+++ branches/2.0/Makefile Wed Aug  6 21:38:53 2008
@@ -272,6 +272,20 @@
 distclean: clean
 	rm -f makeopts autom4te.cache
 
+update: 
+	@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; \
+	else \
+		echo "Not under version control";  \
+	fi
+
 samples:
 	mkdir -p $(ASTETCDIR)
 	for x in configs/*.sample; do \

Modified: branches/2.0/requests.txt
URL: http://svn.digium.com/view/asterisk-gui/branches/2.0/requests.txt?view=diff&rev=3627&r1=3626&r2=3627
==============================================================================
--- branches/2.0/requests.txt (original)
+++ branches/2.0/requests.txt Wed Aug  6 21:38:53 2008
@@ -4,6 +4,9 @@
  their order be an option in the future.  Some users don't need the
  hardware or mISDN sections...
 
- Another thing I noticed.... "make update" is missing, I think I was 
- the one that submitted it the last time so could we get that back?
- Please....
+
+******----------------------Completed-------------------------******
+
+Another thing I noticed.... "make update" is missing, I think I was 
+the one that submitted it the last time so could we get that back?
+Please....