Changeset 0c395c0 in rtems-libbsd

Timestamp:

Apr 7, 2015, 12:00:07 PM (6 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

4f75a78

Parents:

da5e3a2

git-author:

Sebastian Huber <sebastian.huber@…> (04/07/15 12:00:07)

git-committer:

Sebastian Huber <sebastian.huber@…> (04/08/15 05:57:05)

Message:

Add generated files

This avoids dependencies on a particular generator tool version. On
MinGW and Cygwin hosts these tools tend to be outdated or somehow
incapable.

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (3 diffs)
• freebsd-to-rtems.py (modified) (4 diffs)
• freebsd/include/rpc/rpcb_prot.h (added)
• freebsd/lib/libc/net/nslexer.c (added)
• freebsd/lib/libc/net/nsparser.c (added)
• freebsd/lib/libc/net/nsparser.h (added)
• freebsd/lib/libipsec/policy_parse.c (added)
• freebsd/lib/libipsec/policy_token.c (added)
• freebsd/lib/libipsec/y.tab.h (added)
• freebsd/sbin/route/keywords.h (added)

.gitignore

@@ -5 +5 @@
 *.map
 libbsd.html
-freebsd/sbin/route/keywords.h
-freebsd/include/rpc/rpcb_prot.h
-freebsd/lib/libipsec/y.tab.h
-freebsd/lib/libipsec/policy_parse.c
-freebsd/lib/libipsec/policy_token.c
-freebsd/lib/libc/net/nsparser.h
-freebsd/lib/libc/net/nslexer.c
-freebsd/lib/libc/net/nsparser.c
 rtemsbsd/rtems/rtems-kvm-symbols.c
 testsuite/include/rtems/bsd/test/network-config.h

Makefile

@@ -145 +145 @@
 rtemsbsd/rtems/rtems-kvm-symbols.c: rtemsbsd/rtems/generate_kvm_symbols
         ./$< > $@
-LIB_GEN_FILES += freebsd/lib/libc/net/nslexer.c
 LIB_C_FILES += freebsd/lib/libc/net/nslexer.c
 freebsd/lib/libc/net/nslexer.c: freebsd/lib/libc/net/nslexer.l freebsd/lib/libc/net/nsparser.c
         ${LEX} -P _nsyy -t $< | sed -e '/YY_BUF_SIZE/s/16384/1024/' > $@
-LIB_GEN_FILES += freebsd/lib/libc/net/nsparser.c
 LIB_C_FILES += freebsd/lib/libc/net/nsparser.c
 freebsd/lib/libc/net/nsparser.c: freebsd/lib/libc/net/nsparser.y
@@ -156 +154 @@
         rm -f _nsyy.tab.c
         mv _nsyy.tab.h freebsd/lib/libc/net/nsparser.h
-LIB_GEN_FILES += freebsd/lib/libipsec/policy_token.c
 LIB_C_FILES += freebsd/lib/libipsec/policy_token.c
 freebsd/lib/libipsec/policy_token.c: freebsd/lib/libipsec/policy_token.l freebsd/lib/libipsec/policy_parse.c
         ${LEX} -P __libipsecyy -t $< | sed -e '/YY_BUF_SIZE/s/16384/1024/' > $@
-LIB_GEN_FILES += freebsd/lib/libipsec/policy_parse.c
 LIB_C_FILES += freebsd/lib/libipsec/policy_parse.c
 freebsd/lib/libipsec/policy_parse.c: freebsd/lib/libipsec/policy_parse.y
@@ -617 +613 @@
 LIB_C_FILES += freebsd/sys/v850/v850/in_cksum.c
 endif
-LIB_GEN_FILES += freebsd/include/rpc/rpcb_prot.h
 freebsd/include/rpc/rpcb_prot.h: freebsd/include/rpc/rpcb_prot.x
                 rm -f $@
                 rpcgen -h -o $@ $<
-LIB_GEN_FILES += freebsd/sbin/route/keywords.h
 freebsd/sbin/route/keywords.h: freebsd/sbin/route/keywords
         sed -e '/^#/d' -e '/^$$/d' $< > freebsd/sbin/route/keywords.tmp

freebsd-to-rtems.py

@@ -2231 +2231 @@
         def compose(self, path):
                 headerPath = path[:-2] + '.h'
-                return 'LIB_GEN_FILES += ' + headerPath + '\n' \
-                        + headerPath + ': ' + path + '\n' \
+                return headerPath + ': ' + path + '\n' \
                         '\t     rm -f $@\n' \
                         '\t     rpcgen -h -o $@ $<\n'
@@ -2242 +2241 @@
                 headerPath = path + '.h'
                 tmpPath = path + '.tmp'
-                return 'LIB_GEN_FILES += ' + headerPath + '\n' \
-                        + headerPath + ': ' + path + '\n' \
+                return headerPath + ': ' + path + '\n' \
                         '\tsed -e \'/^#/d\' -e \'/^$$/d\' $< > ' + tmpPath + '\n' \
                         '\tLC_ALL=C tr \'a-z\' \'A-Z\' < ' + tmpPath + ' | paste ' + tmpPath + ' - | \\\n' \
@@ -2259 +2257 @@
                 src = path[:-2] + '.c'
                 dep = path[:path.rfind('/')] + '/' + self.dep
-                return 'LIB_GEN_FILES += ' + src + '\n' \
-                        'LIB_C_FILES += ' + src + '\n' \
+                return 'LIB_C_FILES += ' + src + '\n' \
                         + src + ': ' + path + ' ' + dep + '\n' \
                         '\t${LEX} -P ' + self.sym + ' -t $< | sed -e \'/YY_BUF_SIZE/s/16384/1024/\' > $@\n'
@@ -2272 +2269 @@
                 src = path[:-2] + '.c'
                 hdr = path[:path.rfind('/')] + '/' + self.header
-                return 'LIB_GEN_FILES += ' + src + '\n' \
-                        'LIB_C_FILES += ' + src + '\n' \
+                return 'LIB_C_FILES += ' + src + '\n' \
                         + src + ': ' + path + '\n' \
                         '\tyacc -b ' + self.sym + ' -d -p ' + self.sym + ' $<\n' \