[asterisk-commits] mvanbaak: branch group/appdocsxml r130429 - in /team/group/appdocsxml: ./ main/

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Sat Jul 12 07:55:18 2008
New Revision: 130429

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130429
Log:
move the generated xml file to doc/core-en.xml
Load the 'en_US' version by default instead of the 'en'

Also changed the path to the core-en.xml file because
on OpenBSD it's installed in /usr/share/asterisk.
We should really make this autodetected :)

Modified:
    team/group/appdocsxml/Makefile
    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=130429&r1=130428&r2=130429
==============================================================================
--- team/group/appdocsxml/Makefile (original)
+++ team/group/appdocsxml/Makefile Sat Jul 12 07:55:18 2008
@@ -480,16 +480,16 @@
 
 documentation:
 	@echo -n "Building Documentation For: "
-	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > documentation.xml
-	@echo "<docs>" >> documentation.xml
+	@echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > doc/core-en.xml
+	@echo "<docs>" >> doc/core-en.xml
 	@for x in $(MOD_SUBDIRS); do \
 		echo -n "$$x " ; \
 		for i in $$x/*.c; do \
-			$(AWK) -f build_tools/get_documentation $$i >> documentation.xml ; \
+			$(AWK) -f build_tools/get_documentation $$i >> doc/core-en.xml ; \
 		done ; \
 	done
-	@echo "</docs>" >> documentation.xml
-	@echo -e "\ndocumentation.xml --> $(ASTVARLIBDIR)/documentation.xml"
+	@echo "</docs>" >> doc/core-en.xml
+	@echo -e "\ndoc/core-en.xml --> $(ASTVARLIBDIR)/core-en.xml"
 
 update: 
 	@if [ -d .svn ]; then \
@@ -545,7 +545,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 doc/core-en.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
@@ -695,7 +695,7 @@
 		echo ";runuser = asterisk ; The user to run as" ; \
 		echo ";rungroup = asterisk ; The group to run as" ; \
 		echo "dahdichanname = yes ; Set channel name as DAHDI" ; \
-		echo "documentation_language = en ; Set the Language you want Documentation displayed in" ; \
+		echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \
 		echo "" ; \
 		echo "; Changing the following lines may compromise your security." ; \
 		echo ";[files]" ; \

Modified: team/group/appdocsxml/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/pbx.c?view=diff&rev=130429&r1=130428&r2=130429
==============================================================================
--- team/group/appdocsxml/main/pbx.c (original)
+++ team/group/appdocsxml/main/pbx.c Sat Jul 12 07:55:18 2008
@@ -111,7 +111,8 @@
 #define BACKGROUND_PLAYBACK	(1 << 3)
 
 /* Don't know what this should be. */
-#define FILE_XML_DOC "/var/lib/asterisk/documentation.xml"
+/* XXX: make this configurable */
+#define FILE_XML_DOC "/usr/share/asterisk/core-en.xml"
 
 AST_APP_OPTIONS(background_opts, {
 	AST_APP_OPTION('s', BACKGROUND_SKIP),
@@ -8421,7 +8422,7 @@
 #endif
 
 #ifdef XML_DOCUMENTATION
-	snprintf(documentation_language, sizeof(documentation_language), "en");
+	snprintf(documentation_language, sizeof(documentation_language), "en_US");
 	if (!(cfg = ast_config_load("asterisk.conf", cnfflags))) {
 		ast_log(LOG_ERROR, "No asterisk.conf? That cannot be good.\n");
 	}