[asterisk-commits] branch murf/AEL2 r21233 - in
/team/murf/AEL2/pbx: ./ ael-test/ ael/ael-test/ ...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Tue Apr 18 16:04:38 MST 2006
Author: murf
Date: Tue Apr 18 18:04:29 2006
New Revision: 21233
URL: http://svn.digium.com/view/asterisk?rev=21233&view=rev
Log:
Moved the ael-test dir down into the ael subdir.
Reset all those props again on the moved files.
Deleted the original pbx_ael.c file, moved the pbx_ael2.c into
its position, and set all the necc. props. Further
debugged the Makefile.
Added:
team/murf/AEL2/pbx/ael/ael-test/
- copied from r20758, team/murf/AEL2/pbx/ael-test/
team/murf/AEL2/pbx/ael/ael-test/ael-test1/
- copied from r21231, team/murf/AEL2/pbx/ael-test/ael-test1/
team/murf/AEL2/pbx/ael/ael-test/ael-test2/
- copied from r21231, team/murf/AEL2/pbx/ael-test/ael-test2/
team/murf/AEL2/pbx/ael/ael-test/ael-test3/
- copied from r21231, team/murf/AEL2/pbx/ael-test/ael-test3/
team/murf/AEL2/pbx/ael/ael-test/ael-test4/
- copied from r21231, team/murf/AEL2/pbx/ael-test/ael-test4/
team/murf/AEL2/pbx/ael/ael-test/ref.ael-test1
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/ref.ael-test1
team/murf/AEL2/pbx/ael/ael-test/ref.ael-test2
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/ref.ael-test2
team/murf/AEL2/pbx/ael/ael-test/ref.ael-test3
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/ref.ael-test3
team/murf/AEL2/pbx/ael/ael-test/ref.ael-test4
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/ref.ael-test4
team/murf/AEL2/pbx/ael/ael-test/runtests
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/runtests
team/murf/AEL2/pbx/ael/ael-test/setref
- copied unchanged from r21231, team/murf/AEL2/pbx/ael-test/setref
team/murf/AEL2/pbx/pbx_ael.c (contents, props changed)
- copied, changed from r20785, team/murf/AEL2/pbx/pbx_ael2.c
Removed:
team/murf/AEL2/pbx/ael-test/
team/murf/AEL2/pbx/pbx_ael2.c
Modified:
team/murf/AEL2/pbx/Makefile
Modified: team/murf/AEL2/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/Makefile?rev=21233&r1=21232&r2=21233&view=diff
==============================================================================
--- team/murf/AEL2/pbx/Makefile (original)
+++ team/murf/AEL2/pbx/Makefile Tue Apr 18 18:04:29 2006
@@ -67,31 +67,31 @@
pbx_ael.o : ael/aelflex.o ael/aelbison.o ../include/asterisk/ael_structs.h aal/argdesc.tab.o aal/argdesc_lex.o
pbx_ael.so : pbx_ael.o ael/aelbison.o ael/aelflex.o aal/argdesc.tab.o aal/argdesc_lex.o
- $(CC) $(SOLINK) -o $@ ael/pbx_ael.o ael/aelbison.o ael/aelflex.o aal/argdesc.tab.o aal/argdesc_lex.o
+ $(CC) $(SOLINK) -o $@ pbx_ael.o ael/aelbison.o ael/aelflex.o aal/argdesc.tab.o aal/argdesc_lex.o
-ael/aelflex.o : ael_lex.c ../include/asterisk/ael_structs.h ael.tab.h
+ael/aelflex.o : ael/ael_lex.c ../include/asterisk/ael_structs.h ael/ael.tab.h
$(CC) $(CFLAGS) -c -o ael/aelflex.o ael/ael_lex.c
-ael/aelbison.o : ael.tab.c ael.tab.h ../include/asterisk/ael_structs.h
+ael/aelbison.o : ael/ael.tab.c ael/ael.tab.h ../include/asterisk/ael_structs.h
$(CC) $(CFLAGS) -c -o ael/aelbison.o ael/ael.tab.c ## -DYYDEBUG
-ael/ael_lex.c : ael.flex
+ael/ael_lex.c : ael/ael.flex
(cd ael; flex ael.flex)
-ael/ael.tab.c ael.tab.h : ael.y
+ael/ael.tab.c ael/ael.tab.h : ael/ael.y
(cd ael; bison -v -d ael.y)
aal/argdesc.tab.c aal/argdesc.tab.h : aal/argdesc.y
(cd aal; bison -v -d argdesc.y )
-aal/argdesc_lex.c : argdesc.l ../include/asterisk/argdesc.h
+aal/argdesc_lex.c : aal/argdesc.l ../include/asterisk/argdesc.h
(cd aal; flex argdesc.l)
-argdesc.tab.o : argdesc.tab.c argdesc.tab.h
- $(CC) $(CFLAGS) -c -o argdesc.tab.o argdesc.tab.c ## -DYYDEBUG
+aal/argdesc.tab.o : aal/argdesc.tab.c aal/argdesc.tab.h
+ $(CC) $(CFLAGS) -c -o aal/argdesc.tab.o aal/argdesc.tab.c ## -DYYDEBUG
-aal/argdesc_lex.o : argdesc_lex.c ../include/asterisk/argdesc.h argdesc.tab.h
- $(CC) $(CFLAGS) -c -o argdesc_lex.o argdesc_lex.c
+aal/argdesc_lex.o : aal/argdesc_lex.c ../include/asterisk/argdesc.h aal/argdesc.tab.h
+ $(CC) $(CFLAGS) -c -o aal/argdesc_lex.o aal/argdesc_lex.c
%.moc : %.h
Copied: team/murf/AEL2/pbx/pbx_ael.c (from r20785, team/murf/AEL2/pbx/pbx_ael2.c)
URL: http://svn.digium.com/view/asterisk/team/murf/AEL2/pbx/pbx_ael.c?p2=team/murf/AEL2/pbx/pbx_ael.c&p1=team/murf/AEL2/pbx/pbx_ael2.c&r1=20785&r2=21233&rev=21233&view=diff
==============================================================================
--- team/murf/AEL2/pbx/pbx_ael2.c (original)
+++ team/murf/AEL2/pbx/pbx_ael.c Tue Apr 18 18:04:29 2006
@@ -32,7 +32,7 @@
#include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 7578 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/pbx.h"
#include "asterisk/config.h"
@@ -66,8 +66,8 @@
static int aeldebug = 0;
static char *dtext = "Asterisk Extension Language Compiler v2";
-static char *config = "extensions.ael2";
-static char *registrar = "pbx_ael2";
+static char *config = "extensions.ael";
+static char *registrar = "pbx_ael";
static int errs, warns, notes;
@@ -99,6 +99,9 @@
int is_empty(char *arg);
int option_matches( struct argdesc *should, pval *is, struct argapp *app);
int check_app_args(pval *appcall, pval *arglist, struct argapp *app);
+const char *description(void);
+const char *key(void);
+
static pval *current_db;
static pval *current_context;
static pval *current_extension;
@@ -3438,10 +3441,10 @@
static struct ast_cli_entry ael2_cli[] = {
{ { "ael2", "reload", NULL }, ael2_reload, "Reload AEL2 configuration"},
- { { "ael2", "debug", "read", NULL }, ael2_debug_read, "Enable AEL2 read debug"},
- { { "ael2", "debug", "tokens", NULL }, ael2_debug_tokens, "Enable AEL2 tokens debug"},
- { { "ael2", "debug", "macros", NULL }, ael2_debug_macros, "Enable AEL2 macros debug"},
- { { "ael2", "debug", "contexts", NULL }, ael2_debug_contexts, "Enable AEL2 contexts debug"},
+ { { "ael2", "debug", "read", NULL }, ael2_debug_read, "Enable AEL2 read debug (does nothing now)"},
+ { { "ael2", "debug", "tokens", NULL }, ael2_debug_tokens, "Enable AEL2 tokens debug (does nothing now)"},
+ { { "ael2", "debug", "macros", NULL }, ael2_debug_macros, "Enable AEL2 macros debug (does nothing now)"},
+ { { "ael2", "debug", "contexts", NULL }, ael2_debug_contexts, "Enable AEL2 contexts debug (does nothing now)"},
{ { "ael2", "no", "debug", NULL }, ael2_no_debug, "Disable AEL2 debug messages"},
};
Propchange: team/murf/AEL2/pbx/pbx_ael.c
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: team/murf/AEL2/pbx/pbx_ael.c
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: team/murf/AEL2/pbx/pbx_ael.c
------------------------------------------------------------------------------
svn:mime-type = text/plain
More information about the asterisk-commits
mailing list