[asterisk-commits] twilson: trunk r340221 - in /trunk: ./ utils/

[SVN commits to the Asterisk project]

Author: twilson
Date: Mon Oct 10 17:54:03 2011
New Revision: 340221

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=340221
Log:
Merged revisions 340219-340220 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r340219 | twilson | 2011-10-10 15:38:06 -0700 (Mon, 10 Oct 2011) | 8 lines
  
  Add astdb conversion utility for Berkeley to SQLite 3
  
  If someone wants to backtrack from Asterisk 1.8 to 10 they can use the
  astdb2bdb utility to convert the database back to the Berkeley format
  that Asterisk 1.8 uses.
  
  Review: https://reviewboard.asterisk.org/r/1502/
........
  r340220 | twilson | 2011-10-10 15:39:41 -0700 (Mon, 10 Oct 2011) | 2 lines
  
  Add a missing file for the astdb2bdb conversion utility
........

Added:
    trunk/utils/astdb2bdb.c
      - copied unchanged from r340220, branches/10/utils/astdb2bdb.c
Modified:
    trunk/   (props changed)
    trunk/UPGRADE.txt
    trunk/utils/Makefile
    trunk/utils/utils.xml

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=340221&r1=340220&r2=340221
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Mon Oct 10 17:54:03 2011
@@ -87,7 +87,9 @@
    SQLite 3. An existing Berkeley astdb file can be converted with the astdb2sqlite3
    utility in the UTILS section of menuselect. If an existing astdb is found and no
    astdb.sqlite3 exists, astdb2sqlite3 will be compiled automatically. Asterisk will
-   convert an existing astdb to the SQLite3 version automatically at runtime.
+   convert an existing astdb to the SQLite3 version automatically at runtime. If
+   moving back from Asterisk 10 to Asterisk 1.8, the astdb2bdb utility can be used
+   to create a Berkeley DB copy of the SQLite3 astdb that Asterisk 10 uses.
 
 Manager:
  - The AMI protocol version was incremented to 1.2 as a result of changing two

Modified: trunk/utils/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/Makefile?view=diff&rev=340221&r1=340220&r2=340221
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Mon Oct 10 17:54:03 2011
@@ -214,7 +214,11 @@
 
 astdb2sqlite3: LIBS+=$(SQLITE3_LIB)
 astdb2sqlite3: _ASTCFLAGS+=$(SQLITE3_INCLUDE)
-astdb2sqlite3: db1-ast/libdb1.a 
+astdb2sqlite3: db1-ast/libdb1.a
+
+astdb2bdb: LIBS+=$(SQLITE3_LIB)
+astdb2bdb: _ASTCFLAGS+=$(SQLITE3_INCLUDE)
+astdb2bdb: db1-ast/libdb1.a
 
 ifneq ($(wildcard .*.d),)
    include .*.d

Modified: trunk/utils/utils.xml
URL: http://svnview.digium.com/svn/asterisk/trunk/utils/utils.xml?view=diff&rev=340221&r1=340220&r2=340221
==============================================================================
--- trunk/utils/utils.xml (original)
+++ trunk/utils/utils.xml Mon Oct 10 17:54:03 2011
@@ -7,6 +7,9 @@
 	<defaultenabled>yes</defaultenabled>
   </member>
   <member name="astdb2sqlite3">
+	<defaultenabled>yes</defaultenabled>
+  </member>
+  <member name="astdb2bdb">
 	<defaultenabled>yes</defaultenabled>
   </member>
   <member name="astman">