[svn-commits] bkruse: branch group/appdocsxml r127993 - in /…

Author: bkruse
Date: Fri Jul 4 03:16:23 2008
New Revision: 127993

URL: http://svn.digium.com/view/asterisk?view=rev&rev=127993
Log:
Now generating documentation.xml automatically.

Stopping on the iksemel sax parsing, since I am
going to end up using something else that is ligheter
and more geared towards just xml parsing.

Modified:
team/group/appdocsxml/Makefile
team/group/appdocsxml/TODO_appdocsxml
team/group/appdocsxml/main/pbx.c

Modified: team/group/appdocsxml/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/Makefile?view=diff&rev=127993&r1=127992&r2=127993
==============================================================================
--- team/group/appdocsxml/Makefile (original)
+++ team/group/appdocsxml/Makefile Fri Jul 4 03:16:23 2008
@@ -482,6 +482,17 @@
    mkdir -p $(DESTDIR)$(AGI_DIR)
    $(MAKE) -C sounds install

+documentation:
+    @echo "Building Documentation."
+    @echo "<docs>" > documentation.xml
+    @for x in $(MOD_SUBDIRS); do \
+        for i in $$x/*.c; do \
+            $(AWK) -f build_tools/get_documentation $$i >> documentation.xml ; \
+        done ; \
+    done
+    @echo "</docs>" >> documentation.xml
+    @echo "Done."
+
update:
    @if [ -d .svn ]; then \
        echo "Updating from Subversion..." ; \
@@ -536,6 +547,7 @@
    mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware
    mkdir -p $(DESTDIR)$(ASTDATADIR)/firmware/iax
    mkdir -p $(DESTDIR)$(ASTMANDIR)/man8
+    $(INSTALL) -m 644 documentation.xml $(ASTVARLIBDIR)
    $(INSTALL) -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTDATADIR)/keys
    $(INSTALL) -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTDATADIR)/keys
    $(INSTALL) -m 644 doc/asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8
@@ -577,7 +589,7 @@
    @exit 1
endif

-install: badshell datafiles bininstall
+install: badshell datafiles documentation bininstall
    @if [ -x /usr/sbin/asterisk-post-install ]; then \
        /usr/sbin/asterisk-post-install $(DESTDIR) . ; \
    fi

Modified: team/group/appdocsxml/TODO_appdocsxml
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/TODO_appdocsxml?view=diff&rev=127993&r1=127992&r2=127993
==============================================================================
--- team/group/appdocsxml/TODO_appdocsxml (original)
+++ team/group/appdocsxml/TODO_appdocsxml Fri Jul 4 03:16:23 2008
@@ -36,3 +36,6 @@

Add the parsing of files to one xml blob, and copying to
/var/lib/asterisk/documentation.xml
+
+Change from iksemel to some other XML
+parsing library (libxml?)

Modified: team/group/appdocsxml/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/pbx.c?view=diff&rev=127993&r1=127992&r2=127993
==============================================================================
--- team/group/appdocsxml/main/pbx.c (original)
+++ team/group/appdocsxml/main/pbx.c Fri Jul 4 03:16:23 2008
@@ -4381,8 +4381,11 @@
    fseek(xmldoc, 0, SEEK_SET);

    buf = (char *)malloc(length);
+
+    fread(buf, length, 1, xmldoc);
    fclose(xmldoc);

+    ast_log(LOG_ERROR, "test: %s\n", buf);
    /* Ok, let's now process it. */
    /* Check for errors in loading the doc */
    switch(iks_parse(p, buf, 0, 1)) {

_______________________________________________
--Bandwidth and Colocation Provided by http://www.api-digital.com--

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits