libc: Update auto-gen scripts
Make the scripts use external/kernel-headers/original by default.
clean_header.py: Document -k<path>, add -d<path>
find_headers.py: Make kernel config files optional
update_all.py: Allow setting the path to kernel headers on the command-line
update_all.py: Better formatting of output on ttys
update_all.py: Automatically perform "git add/rm" on affected files.
SYSCALLS.TXT: Fix typo in __socketcall definition.
checksyscalls.py: Add support for superH architecture in the checks.
gensyscalls.py: Automatically perform "git add/rm" on affected files.
cpp.py: Fixed a bug that prevented certain type definitions to
be kept in the generated clean header (e.g.
struct ethtool_drvinfo in <linux/ethtool.h>)
All scripts will use the content of external/kernel-headers/original by default now.
The generated code removes all empty lines and trailing whitespace. This is useful
to ensure a unified output even if we change the parser again in the future.
The top-level disclaimer has been edited with update instructions to regenerate
the headers when needed.
Also, a warning is now inserted every 8th line in the final output:
/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */
Changes under kernel/arch-arm and kernel/arch-x86 should correspond to whitespace
differences and additionnal struct definitions that were missed by the previous
parser implementation.
Change-Id: Icd1c056bacd766759f3e9b7bb5d63a246f3d656a
WARNING: If you run these script, do not submit the result to gerrit for now.
It seems there are discrepancies between the content of original headers
and those currently commited under bionic/libc/kernel/.
(This problem is the main motivation to insert the warning repeatedly).
Current list of issues:
- Missing SuperH headers (i.e. external/kernel-headers/original/asm-sh)
This commit is contained in:
@@ -6,7 +6,7 @@ from utils import *
|
||||
|
||||
def usage():
|
||||
print """\
|
||||
usage: %(progname)s
|
||||
usage: %(progname)s [kernel-original-path]
|
||||
|
||||
this program is used to update all the auto-generated clean headers
|
||||
used by the Bionic C library. it assumes the following:
|
||||
@@ -31,13 +31,19 @@ except:
|
||||
sys.stderr.write( "error: unrecognized option\n" )
|
||||
usage()
|
||||
|
||||
if len(optlist) > 0 or len(args) > 0:
|
||||
if len(optlist) > 0 or len(args) > 1:
|
||||
usage()
|
||||
|
||||
progdir = find_program_dir()
|
||||
original_dir = os.path.normpath( progdir + "/../original" )
|
||||
if not os.path.isdir( original_dir ):
|
||||
panic( "required directory does not exists: %s\n" % original_dir )
|
||||
|
||||
if len(args) == 1:
|
||||
original_dir = arg[0]
|
||||
if not os.path.isdir(original_dir):
|
||||
panic( "Not a directory: %s" % original_dir )
|
||||
else:
|
||||
original_dir = kernel_original_path
|
||||
if not os.path.isdir(original_dir):
|
||||
panic( "Missing directory, please specify one through command-line: %s" % original_dir )
|
||||
|
||||
# find all source files in 'original'
|
||||
#
|
||||
@@ -57,29 +63,36 @@ b.readDir( os.path.normpath( progdir + "/../common" ) )
|
||||
|
||||
#print "OLD " + repr(b.old_files)
|
||||
|
||||
oldlen = 120
|
||||
for path in sources:
|
||||
dst_path, newdata = clean_header.cleanupFile(path)
|
||||
dst_path, newdata = clean_header.cleanupFile(path, original_dir)
|
||||
if not dst_path:
|
||||
continue
|
||||
|
||||
b.readFile( dst_path )
|
||||
r = b.editFile( dst_path, newdata )
|
||||
if r == 0:
|
||||
r = "unchanged"
|
||||
state = "unchanged"
|
||||
elif r == 1:
|
||||
r = "edited"
|
||||
state = "edited"
|
||||
else:
|
||||
r = "added"
|
||||
state = "added"
|
||||
|
||||
print "cleaning: %-*s -> %-*s (%s)" % ( 35, path, 35, dst_path, r )
|
||||
str = "cleaning: %-*s -> %-*s (%s)" % ( 35, "<original>" + path[len(original_dir):], 35, dst_path, state )
|
||||
if sys.stdout.isatty():
|
||||
print "%-*s" % (oldlen,str),
|
||||
if (r == 0):
|
||||
print "\r",
|
||||
else:
|
||||
print "\n",
|
||||
oldlen = 0
|
||||
else:
|
||||
print str
|
||||
|
||||
# We don't use Perforce anymore, but just in case, define ANDROID_USE_P4
|
||||
# in your environment if you think you need it.
|
||||
usePerforce = os.environ.has_key("ANDROID_USE_P4")
|
||||
oldlen = len(str)
|
||||
|
||||
if usePerforce:
|
||||
b.updateP4Files()
|
||||
else:
|
||||
b.updateFiles()
|
||||
print "%-*s" % (oldlen,"Done!")
|
||||
|
||||
b.updateGitFiles()
|
||||
|
||||
sys.exit(0)
|
||||
|
||||
Reference in New Issue
Block a user