[asterisk-commits] branch oej/peermatch r34847 - in /team/oej/peermatch: ./ build_tools/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Jun 19 10:53:44 2006
New Revision: 34847

URL: http://svn.digium.com/view/asterisk?rev=34847&view=rev
Log:
Forced update

Modified:
    team/oej/peermatch/   (props changed)
    team/oej/peermatch/Makefile
    team/oej/peermatch/build_tools/menuselect.c

Propchange: team/oej/peermatch/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/peermatch/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 19 10:53:44 2006
@@ -1,1 +1,1 @@
-/trunk:1-34817
+/trunk:1-34845

Modified: team/oej/peermatch/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/peermatch/Makefile?rev=34847&r1=34846&r2=34847&view=diff
==============================================================================
--- team/oej/peermatch/Makefile (original)
+++ team/oej/peermatch/Makefile Mon Jun 19 10:53:44 2006
@@ -263,15 +263,8 @@
   RPMVERSION=unknown
 endif
 
-# CVS mirrors of SVN have .svnrevision files showing
-# which SVN revision they are based on, and .svnbranch
-# showing the branch they are made from
-ifneq ($(wildcard .svnrevision),)
+ifneq ($(wildcard .svn),)
   ASTERISKVERSIONNUM=999999
-else
-  ifneq ($(wildcard .svn),)
-    ASTERISKVERSIONNUM=999999
-  endif
 endif
 
 ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
@@ -458,21 +451,21 @@
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then echo ; else \
+	@if cmp -s $@.tmp $@ ; then : ; else \
 		mv $@.tmp $@ ; \
 	fi
 	@rm -f $@.tmp
 
 include/asterisk/version.h:
 	@build_tools/make_version_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then echo; else \
+	@if cmp -s $@.tmp $@ ; then : ; else \
 		mv $@.tmp $@ ; \
 	fi
 	@rm -f $@.tmp
 
 include/asterisk/buildopts.h: menuselect.makeopts
 	@build_tools/make_buildopts_h > $@.tmp
-	@if cmp -s $@.tmp $@ ; then echo; else \
+	@if cmp -s $@.tmp $@ ; then : ; else \
 		mv $@.tmp $@ ; \
 	fi
 	@rm -f $@.tmp
@@ -544,16 +537,6 @@
 		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; \
-		$(MAKE) clean-depend; \
-	elif [ -d CVS ]; then \
-		echo "Updating from CVS..." ; \
-		cvs -q -z3 update -Pd | 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 -d' ' -f2- ; \
 		fi ; \
 		rm -f update.out; \
 		$(MAKE) clean-depend; \
@@ -603,11 +586,7 @@
 	$(INSTALL) -m 644 contrib/scripts/astgenkey.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/autosupport.8 $(DESTDIR)$(ASTMANDIR)/man8
 	$(INSTALL) -m 644 contrib/scripts/safe_asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
-	if [ -d contrib/firmware/iax ]; then \
-		$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
-	else \
-		echo "You need to do cvs update -d not just cvs update" ; \
-	fi 
+	$(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin; \
 
 install-subdirs:
 	@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done

Modified: team/oej/peermatch/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/oej/peermatch/build_tools/menuselect.c?rev=34847&r1=34846&r2=34847&view=diff
==============================================================================
--- team/oej/peermatch/build_tools/menuselect.c (original)
+++ team/oej/peermatch/build_tools/menuselect.c Mon Jun 19 10:53:44 2006
@@ -69,6 +69,18 @@
 
 /*! This is set when the --check-deps argument is provided. */
 static int check_deps = 0;
+
+#if !defined(ast_strdupa) && defined(__GNUC__)
+#define ast_strdupa(s)                                                    \
+	(__extension__                                                    \
+	({                                                                \
+		const char *__old = (s);                                  \
+		size_t __len = strlen(__old) + 1;                         \
+		char *__new = __builtin_alloca(__len);                    \
+		memcpy (__new, __old, __len);                             \
+		__new;                                                    \
+	}))
+#endif
 
 /*! \brief return a pointer to the first non-whitespace character */
 static inline char *skip_blanks(char *str)
@@ -516,7 +528,7 @@
 			had_changes = 1;
 
 			if (mem->remove_on_change) {
-				for (buf = strdupa(mem->remove_on_change), file = strsep(&buf, " ");
+				for (buf = ast_strdupa(mem->remove_on_change), file = strsep(&buf, " ");
 				     file;
 				     file = strsep(&buf, " "))
 					unlink(file);
@@ -524,7 +536,7 @@
 		}
 
 		if (cat->remove_on_change && had_changes) {
-			for (buf = strdupa(cat->remove_on_change), file = strsep(&buf, " ");
+			for (buf = ast_strdupa(cat->remove_on_change), file = strsep(&buf, " ");
 			     file;
 			     file = strsep(&buf, " "))
 				unlink(file);