vbatts
/
grub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Integrate import_gcry.py in autogen.sh.

This commit is contained in:
Robert Millan 2009-11-17 10:22:54 +00:00
parent 59917f8496
commit 0ef45b9398
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
autogen.sh
View File

@ -4,7 +4,11 @@ set -e
autoconf autoconf
autoheader autoheader
echo timestamp > stamp-h.in echo timestamp > stamp-h.in
python util/import_gcry.py lib/libgcrypt/ .
for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do for rmk in conf/*.rmk ${GRUB_CONTRIB}/*/conf/*.rmk; do
if test -e $rmk ; then if test -e $rmk ; then
ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'` ruby genmk.rb < $rmk > `echo $rmk | sed 's/\.rmk$/.mk/'`

6
util/import_gcry.py
View File

@ -27,7 +27,7 @@ if len (sys.argv) < 3:
indir = sys.argv[1] indir = sys.argv[1]
outdir = sys.argv[2] outdir = sys.argv[2]
basedir = os.path.join (outdir, "gcry") basedir = os.path.join (outdir, "lib/libgcrypt-grub")
try: try:
os.makedirs (basedir) os.makedirs (basedir)
except: except:
@ -181,11 +181,11 @@ for cipher_file in cipher_files:
if len (ciphernames) > 0 or len (mdnames) > 0: if len (ciphernames) > 0 or len (mdnames) > 0:
modname = cipher_file [0:len(cipher_file) - 2] modname = cipher_file [0:len(cipher_file) - 2]
if re.match (".*-glue$", modname): if re.match (".*-glue$", modname):
modfiles = "gcry/cipher/%s gcry/cipher/%s" \ modfiles = "libgcrypt-grub/cipher/%s libgcrypt-grub/cipher/%s" \
% (cipher_file, cipher_file.replace ("-glue.c", ".c")) % (cipher_file, cipher_file.replace ("-glue.c", ".c"))
modname = modname.replace ("-glue", "") modname = modname.replace ("-glue", "")
else: else:
modfiles = "gcry/cipher/%s" % cipher_file modfiles = "libgcrypt-grub/cipher/%s" % cipher_file
modname = "gcry_%s" % modname modname = "gcry_%s" % modname
chmsg = "(GRUB_MOD_INIT(%s)): New function\n" % modname chmsg = "(GRUB_MOD_INIT(%s)): New function\n" % modname
if nch: if nch: