| ", name, " | ", type2, " | ", flags, " | ", state_tags desc > fn
- }
- }
-
- function push_uid()
- {
- level++
- UID_STACK[level] = uid
- }
-
- function pop_uid()
- {
- level--
- uid = UID_STACK[level]
- }
-
- function gen_path(uid ,path) {
- path = ""
- while(LEVEL[uid] > 0) {
- path = NAME[uid] "/" path
- uid = PARENT[uid]
- }
- sub("/$", "", path)
- return path
- }
-
- # structs on the first level must be const
- /struct/ && (level == 0) {
- if (!($0 ~ "struct *[a-z_]*temp_s")) { # special case for core/librnd temp storage
- tmp=$0
- sub("struct.*$", "", tmp)
- if (!(tmp ~ "const")) {
- print "First level structs must be const in line", NR > stderr
- exit 1
- }
- }
- }
-
- /[{]/ {
- uid = uids++
- LEN[uid] = 0
- push_uid()
- }
-
- /^[ \t]*[\/][\/]/ { next }
-
- /CFT_/ {
- SRC[uid, LEN[uid]] = $0
-
- state_tags = ""
- for(st in STATE)
- if (STATE[st]) state_tags=state_tags "," st
- if (state_tags != "") {
- sub("^,", "[", state_tags)
- state_tags = state_tags "] "
- }
- SRC_STATE[uid, LEN[uid]] = state_tags
- LEN[uid]++
- }
-
- /[}]/ {
- name = $0
- sub(".*}[ \t]*", "", name)
- sub("[ \t{].*", "", name)
- sub(";.*", "", name);
-
- PARENT[uid] = UID_STACK[level-1]
- NAME[uid] = name
- LEVEL[uid] = level
-
- pop_uid()
- }
-
- /@conf_gen.sh:/ {
- sub(".*@conf_gen.sh: *", "", $0)
- sub("[*]/", "", $0)
- if ($1 == "begin")
- STATE[$2] = 1
- else if ($1 == "end")
- STATE[$2] = 0
- else
- print "Unknown @conf_gen.sh directive:", $0 > stderr
- }
-
-
- END {
- if (level != -1)
- print "Error: unbalanced braces" > "/dev/stderr"
-
- if (LEN[0] != 0) {
- for(n = 0; n < LEN[0]; n++)
- print "gen_conf ERROR: ignoring line \"" SRC[0, n] "\" in root - needs to be within a struct" > stderr
- }
-
- for(uid = 0; uid < uids; uid++) {
- path = gen_path(uid)
- for(n = 0; n < LEN[uid]; n++)
- gen(path, SRC[uid, n], SRC_STATE[uid, n])
- }
-
- for(fn in DOCS)
- doc_foot(fn)
- }
-'
Property changes on: trunk/scconfig/gen_conf.sh
___________________________________________________________________
Deleted: svn:executable
## -1 +0,0 ##
-*
\ No newline at end of property
Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in (revision 33456)
+++ trunk/src/Makefile.in (revision 33457)
@@ -236,6 +236,7 @@
SPHASH_PATH=$(ROOT)/src_3rd/librnd-local/src_3rd/sphash
SPHASH=$(SPHASH_PATH)/sphash
PUPLUG=$(ROOT)/src_3rd/librnd-local/src_3rd/puplug/util/puplug
+GENCONF=$(ROOT)/src_3rd/librnd-local/src/librnd/scconfig/gen_conf.sh
LIBMINUID_CFLAGS=@/local/pcb/CFLAGS_GENERIC@
LIBMINUID_LDFLAGS=@cc/ldflags@
GENLIST_CFLAGS=@/local/pcb/CFLAGS_GENERIC@
@@ -332,13 +333,13 @@
all-local: pcbtest.sh
conf_core_fields.h: conf_core.h $(ROOT)/doc/conf/tree/rc.html
- AWK=@/host/fstools/awk@ $(ROOT)/scconfig/gen_conf.sh < conf_core.h > conf_core_fields.h
+ AWK=@/host/fstools/awk@ $(GENCONF) < conf_core.h > conf_core_fields.h
$(LIBRND)/core/hidlib_conf_fields.h: $(LIBRND)/core/hidlib_conf.h $(ROOT)/doc/conf/tree/rc.html
- AWK=@/host/fstools/awk@ $(ROOT)/scconfig/gen_conf.sh < $(LIBRND)/core/hidlib_conf.h > $(LIBRND)/core/hidlib_conf_fields.h
+ AWK=@/host/fstools/awk@ $(GENCONF) < $(LIBRND)/core/hidlib_conf.h > $(LIBRND)/core/hidlib_conf_fields.h
$(ROOT)/doc/conf/tree/rc.html: $(LIBRND)/core/hidlib_conf.h conf_core.h
- cat conf_core.h $(LIBRND)/core/hidlib_conf.h | AWK=@/host/fstools/awk@ $(ROOT)/scconfig/gen_conf.sh $(ROOT)/doc/conf/tree > /dev/null
+ cat conf_core.h $(LIBRND)/core/hidlib_conf.h | AWK=@/host/fstools/awk@ $(GENCONF) $(ROOT)/doc/conf/tree > /dev/null
conf_internal.c: pcb-conf.lht $(CQUOTE)
$(CQUOTE) -n pcb_conf_internal < pcb-conf.lht > conf_internal.c
Index: trunk/tests/conf/Makefile
===================================================================
--- trunk/tests/conf/Makefile (revision 33456)
+++ trunk/tests/conf/Makefile (revision 33457)
@@ -24,8 +24,8 @@
all: conftest
-conftest: $(OBJS) $(LIB_HIDLIB) $(LIB_PCBRND_OBJS) $(LIBGENHT)
- $(CC) $(LDFLAGS) $(OBJS) $(LIB_PCBRND_OBJS) $(LIB_HIDLIB) $(LIBGENHT) $(LDLIBS) -o conftest
+conftest: $(OBJS) $(LIB_HIDLIB) $(LIB_PCBRND_OBJS)
+ $(CC) $(LDFLAGS) $(OBJS) $(LIB_PCBRND_OBJS) $(LIB_HIDLIB) $(LDLIBS) -o conftest
conftest.o: conftest.c $(DEPH)
$(CC) $(CFLAGS) -c conftest.c -o conftest.o
Index: trunk/util/gsch2pcb-rnd/Makefile.in
===================================================================
--- trunk/util/gsch2pcb-rnd/Makefile.in (revision 33456)
+++ trunk/util/gsch2pcb-rnd/Makefile.in (revision 33457)
@@ -9,6 +9,7 @@
ROOT=../..
PLUGDIR=../../src_plugins
LIBRND=../../@/local/pcb/librnd_root@/librnd
+GENCONF=$(LIBRND)/scconfig/gen_conf.sh
include $(LIBRND)/core/librnd.mak
@@ -93,7 +94,7 @@
gsch2pcb.o: gsch2pcb_rnd_conf_fields.h
gsch2pcb_rnd_conf_fields.h: gsch2pcb_rnd_conf.h
- AWK=@/host/fstools/awk@ ../../scconfig/gen_conf.sh < gsch2pcb_rnd_conf.h > gsch2pcb_rnd_conf_fields.h
+ AWK=@/host/fstools/awk@ $(GENCONF) < gsch2pcb_rnd_conf.h > gsch2pcb_rnd_conf_fields.h
install_all:
$(SCCBOX) mkdir -p "$(BINDIR)" "$(LIBDIR)"
|