Moved new ac converter from wrap repo and made shebang line use env. Closes #256.

3 files changed, 218 insertions, 123 deletions

diff --git a/tools/ac_converter.py b/tools/ac_converter.py
new file mode 100755
index 000000000..150edb5e9
--- /dev/null
+++ b/tools/ac_converter.py
@@ -0,0 +1,217 @@
+#!/usr/bin/env python3
+
+# Copyright 2015 The Meson development team
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This script reads config.h.meson, looks for header
+checks and writes the corresponding meson declaration.
+
+Copy config.h.in to config.h.meson, replace #undef
+with #mesondefine and run this. We can't do this automatically
+because some configure scripts have #undef statements
+that are unrelated to configure checks.
+"""
+
+import sys
+
+print('''cc = meson.get_compiler('c')
+cdata = configuration_data()''')
+
+print('check_headers = [')
+
+for line in open(sys.argv[1]):
+    line = line.strip()
+    if line.startswith('#mesondefine') and \
+       line.endswith('_H'):
+        token = line.split()[1]
+        tarr = token.split('_')[1:-1]
+        tarr = [x.lower() for x in tarr]
+        hname = '/'.join(tarr) + '.h'
+        print("  ['%s', '%s']," % (token, hname))
+print(']\n')
+
+print('''foreach h : check_headers
+  if cc.has_header(h.get(1))
+    cdata.set(h.get(0), 1)
+  endif
+endforeach
+''')
+
+# Add stuff here as it is encountered.
+function_data = \
+    {'HAVE_FEENABLEEXCEPT' : ('feenableexcept', 'fenv.h'),
+     'HAVE_FECLEAREXCEPT' : ('feclearexcept', 'fenv.h'),
+     'HAVE_FEDISABLEEXCEPT' : ('fedisableexcept', 'fenv.h'),
+     'HAVE_MMAP' : ('mmap', 'sys/mman.h'),
+     'HAVE_GETPAGESIZE' : ('getpagesize', 'unistd.h'),
+     'HAVE_GETISAX' : ('getisax', 'sys/auxv.h'),
+     'HAVE_GETTIMEOFDAY' : ('gettimeofday', 'sys/time.h'),
+     'HAVE_MPROTECT' : ('mprotect', 'sys/mman.h'),
+     'HAVE_POSIX_MEMALIGN' : ('posix_memalign', 'stdlib.h'),
+     'HAVE_SIGACTION' : ('sigaction', 'signal.h'),
+     'HAVE_ALARM' : ('alarm', 'unistd.h'),
+     'HAVE_CLOCK_GETTIME' : ('clock_gettime', 'time.h'),
+     'HAVE_CTIME_R' : ('ctime_r', 'time.h'),
+     'HAVE_DRAND48' : ('drand48', 'stdlib.h'),
+     'HAVE_FLOCKFILE' : ('flockfile', 'stdio.h'),
+     'HAVE_FORK' : ('fork', 'unistd.h'),
+     'HAVE_FUNLOCKFILE' : ('funlockfile', 'stdio.h'),
+     'HAVE_GETLINE' : ('getline', 'stdio.h'),
+     'HAVE_LINK' : ('link', 'unistd.h'),
+     'HAVE_RAISE' : ('raise', 'signal.h'),
+     'HAVE_STRNDUP' : ('strndup', 'string.h'),
+     'HAVE_SCHED_GETAFFINITY' : ('sched_getaffinity', 'sched.h'),
+     'HAVE_WAITPID' : ('waitpid', 'sys/wait.h'),
+     'HAVE_XRENDERCREATECONICALGRADIENT' : ('XRenderCreateConicalGradient', 'xcb/render.h'),
+     'HAVE_XRENDERCREATELINEARGRADIENT' : ('XRenderCreateLinearGradient', 'xcb/render.h'),
+     'HAVE_XRENDERCREATERADIALGRADIENT' : ('XRenderCreateRadialGradient', 'xcb/render.h'),
+     'HAVE_XRENDERCREATESOLIDFILL' : ('XRenderCreateSolidFill', 'xcb/render.h'),
+     'HAVE_DCGETTEXT': ('dcgettext', 'libintl.h'),
+     'HAVE_ENDMNTENT': ('endmntent', 'mntent.h'),
+     'HAVE_ENDSERVENT' : ('endservent', 'netdb.h'),
+     'HAVE_EVENTFD': ('eventfd', 'sys/eventfd.h'),
+     'HAVE_FALLOCATE': ('fallocate', 'fcntl.h'),
+     'HAVE_FCHMOD': ('fchmod', 'sys/stat.h'),
+     'HAVE_FCHOWN': ('fchown', 'unistd.h'),
+     'HAVE_FDWALK': ('fdwalk', 'stdlib.h'),
+     'HAVE_FSYNC': ('fsync', 'unistd.h'),
+     'HAVE_GETC_UNLOCKED': ('getc_unlocked', 'stdio.h'),
+     'HAVE_GETFSSTAT': ('getfsstat', 'sys/mount.h'),
+     'HAVE_GETMNTENT_R': ('getmntent_r', 'mntent.h'),
+     'HAVE_GETPROTOBYNAME_R': ('getprotobyname_r', 'netdb.h'),
+     'HAVE_GETRESUID' : ('getresuid', 'unistd.h'),
+     'HAVE_GETVFSSTAT' : ('getvfsstat', 'sys/statvfs.h'),
+     'HAVE_GMTIME_R' : ('gmtime_r', 'time.h'),
+     'HAVE_HASMNTOPT': ('hasmntopt', 'mntent.h'),
+     'HAVE_IF_INDEXTONAME': ('if_indextoname', 'net/if.h'),
+     'HAVE_IF_NAMETOINDEX': ('if_nametoindex', 'net/if.h'),
+     'HAVE_INOTIFY_INIT1': ('inotify_init1', 'sys/inotify.h'),
+     'HAVE_ISSETUGID': ('issetugid', 'unistd.h'),
+     'HAVE_KEVENT': ('kevent', 'sys/event.h'),
+     'HAVE_KQUEUE': ('kqueue', 'sys/event.h'),
+     'HAVE_LCHMOD': ('lchmod', 'sys/stat.h'),
+     'HAVE_LCHOWN': ('lchown', 'unistd.h'),
+     'HAVE_LSTAT': ('lstat', 'sys/stat.h'),
+     'HAVE_MEMCPY': ('memcpy', 'string.h'),
+     'HAVE_MEMALIGN': ('memalign', 'stdlib.h'),
+     'HAVE_MEMMEM': ('memmem', 'string.h'),
+     'HAVE_NEWLOCALE': ('newlocale', 'locale.h'),
+     'HAVE_PIPE2': ('pipe2', 'fcntl.h'),
+     'HAVE_POLL': ('poll', 'poll.h'),
+     'HAVE_PRLIMIT': ('prlimit', 'sys/resource.h'),
+     'HAVE_PTHREAD_ATTR_SETSTACKSIZE': ('pthread_attr_setstacksize', 'pthread.h'),
+     'HAVE_PTHREAD_CONDATTR_SETCLOCK': ('pthread_condattr_setclock', 'pthread.h'),
+     'HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP': ('pthread_cond_timedwait_relative_np', 'pthread.h'),
+     'HAVE_READLINK': ('readlink', 'unistd.h'),
+     'HAVE_RES_INIT': ('res_init', 'resolv.h'),
+     'HAVE_SENDMMSG': ('sendmmsg', 'sys/socket.h'),
+     'HAVE_SETENV': ('setenv', 'stdlib.h'),
+     'HAVE_SETMNTENT': ('setmntent', 'mntent.h'),
+     'HAVE_SNPRINTF': ('snprintf', 'stdio.h'),
+     'HAVE_SPLICE': ('splice', 'fcntl.h'),
+     'HAVE_STATFS': ('statfs', 'mount.h'),
+     'HAVE_STATVFS': ('statvfs', 'sys/statvfs.h'),
+     'HAVE_STPCOPY': ('stpcopy', 'string.h'),
+     'HAVE_STRCASECMP': ('strcasecmp', 'strings.h'),
+     'HAVE_STRLCPY': ('strlcpy', 'string.h'),
+     'HAVE_STRNCASECMP': ('strncasecmp', 'strings.h'),
+     'HAVE_STRSIGNAL': ('strsignal', 'signal.h'),
+     'HAVE_STRTOD_L': ('strtod_l', 'stdlib.h'),
+     'HAVE_STRTOLL_L': ('strtoll_l', 'stdlib.h'),
+     'HAVE_STRTOULL_L': ('strtoull_l', 'stdlib.h'),
+     'HAVE_SYMLINK': ('symlink', 'unistd.h'),
+     'HAVE_SYSCTLBYNAME': ('sysctlbyname', 'sys/sysctl.h'),
+     'HAVE_TIMEGM': ('timegm', 'time.h'),
+     'HAVE_UNSETENV': ('unsetenv', 'stdlib.h'),
+     'HAVE_USELOCALE': ('uselocale', 'xlocale.h'),
+     'HAVE_UTIMES': ('utimes', 'sys/time.h'),
+     'HAVE_VALLOC': ('valloc', 'stdlib.h'),
+     'HAVE_VASPRINTF': ('vasprintf', 'stdio.h'),
+     'HAVE_VSNPRINTF': ('vsnprintf', 'stdio.h'),
+     'HAVE_BCOPY': ('bcopy', 'strings.h'),
+     'HAVE_STRERROR': ('strerror', 'string.h'),
+     'HAVE_MEMMOVE': ('memmove', 'string.h'),
+     'HAVE_STRTOIMAX': ('strtoimax', 'inttypes.h'),
+     'HAVE_STRTOLL': ('strtoll', 'stdlib.h'),
+     'HAVE_STRTOQ': ('strtoq', 'stdlib.h'),
+     'HAVE_ACCEPT4': ('accept4', 'sys/socket.h'),
+     'HAVE_CHMOD': ('chmod', 'sys/stat.h'),
+     'HAVE_CHOWN': ('chown', 'unistd.h'),
+     'HAVE_FSTAT': ('fstat', 'sys/stat.h'),
+     'HAVE_GETADDRINFO': ('getaddrinfo', 'netdb.h'),
+     'HAVE_GETGRGID_R': ('getgrgid_r', 'grp.h'),
+     'HAVE_GETGRNAM_R': ('getgrnam_r', 'grp.h'),
+     'HAVE_GETGROUPS': ('getgroups', 'grp.h'),
+     'HAVE_GETOPT_LONG': ('getopt_long', 'getopt.h'),
+     'HAVE_GETPWNAM_R': ('getpwnam', 'pwd.h'),
+     'HAVE_GETPWUID_R': ('getpwuid_r', 'pwd.h'),
+     'HAVE_GETUID': ('getuid', 'unistd.h'),
+     'HAVE_LRINTF': ('lrintf', 'math.h'),
+     'HAVE_MKFIFO': ('mkfifo', 'sys/stat.h'),
+     'HAVE_MLOCK': ('mlock', 'sys/mman.h'),
+     'HAVE_NANOSLEEP': ('nanosleep', 'time.h'),
+     'HAVE_PIPE': ('pipe', 'unistd.h'),
+     'HAVE_PPOLL': ('ppoll', 'poll.h'),
+     'HAVE_REGEXEC': ('regexec', 'regex.h'),
+     'HAVE_SETEGID': ('setegid', 'unistd.h'),
+     'HAVE_SETEUID': ('seteuid', 'unistd.h'),
+     'HAVE_SETPGID': ('setpgid', 'unistd.h'),
+     'HAVE_SETREGID': ('setregid', 'unistd.h'),
+     'HAVE_SETRESGID': ('setresgid', 'unistd.h'),
+     'HAVE_SETRESUID': ('setresuid', 'unistd.h'),
+     'HAVE_SHM_OPEN': ('shm_open', 'fcntl.h'),
+     'HAVE_SLEEP': ('sleep', 'unistd.h'),
+     'HAVE_STRERROR_R': ('strerror_r', 'string.h'),
+     'HAVE_STRTOF': ('strtof', 'stdlib.h'),
+     'HAVE_SYSCONF': ('sysconf', 'unistd.h'),
+     'HAVE_USLEEP': ('usleep', 'unistd.h'),
+     'HAVE_VFORK': ('vfork', 'unistd.h'),
+    }
+
+print('check_functions = [')
+
+for line in open(sys.argv[1]):
+    try:
+        token = line.split()[1]
+        if token in function_data:
+            fdata = function_data[token]
+            print("  ['%s', '%s', '#include<%s>']," % (token, fdata[0], fdata[1]))
+        elif token.startswith('HAVE_') and not token.endswith('_H'):
+            print('# check token', token)
+    except Exception:
+        pass
+print(']\n')
+
+print('''foreach f : check_functions
+  if cc.has_function(f.get(1), prefix : f.get(2))
+    cdata.set(f.get(0), 1)
+  endif
+endforeach
+''')
+
+# Convert sizeof checks.
+
+for line in open(sys.argv[1]):
+    arr = line.strip().split()
+    if len(arr) != 2:
+        continue
+    elem = arr[1]
+    if elem.startswith('SIZEOF_'):
+        typename = elem.split('_', 1)[1].replace('_P', '*').replace('_', ' ').lower().replace('size t', 'size_t')
+        print("cdata.set('%s', cc.sizeof('%s'))" % (elem, typename))
+
+print('''
+configure_file(input : 'config.h.in',
+  output : 'config.h',
+  configuration : cdata)''')
diff --git a/tools/autotools2meson.py b/tools/autotools2meson.py
deleted file mode 100755
index 1ec134835..000000000
--- a/tools/autotools2meson.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/python3
-
-# Copyright 2014 Jussi Pakkanen
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-#     http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-import sys, os, re
-
-class Converter():
-    def __init__(self, root):
-        self.project_root = root
-
-    def readlines(self, file, continuator):
-        line = file.readline()
-        while line != '':
-            line = line.rstrip()
-            while line.endswith(continuator):
-                line = line[:-1] + file.readline().rstrip()
-            yield line
-            line = file.readline()
-
-    def convert(self, subdir=None):
-        if subdir is None:
-            subdir = self.project_root
-        try:
-            ifile = open(os.path.join(subdir, 'Makefile.am'))
-        except FileNotFoundError:
-            print('Makefile.am not found in subdir', subdir)
-            return
-        ofile = open(os.path.join(subdir, 'meson.build'), 'w')
-        if subdir == self.project_root:
-            self.process_autoconf(ofile, subdir)
-        for line in self.readlines(ifile, '\\'):
-            items = line.strip().split()
-            if len(items) == 0:
-                ofile.write('\n')
-                continue
-            if items[0] == 'SUBDIRS':
-                for i in items[2:]:
-                    if i != '.':
-                        ofile.write("subdir('%s')\n" % i)
-                        self.convert(os.path.join(subdir, i))
-            elif items[0].endswith('_SOURCES'):
-                self.convert_target(ofile, items)
-            else:
-                ofile.write("# %s\n" % line)
-
-    def convert_target(self, ofile, items):
-        if items[0].endswith('la_SOURCES'):
-            func = 'shared_library'
-            tname = "'%s'" % items[0][:-11]
-        elif items[0].endswith('a_SOURCES'):
-            func = 'static_library'
-            tname = "'%s'" % items[0][:-10]
-        else:
-            func = 'executable'
-            tname = "'%s'" % items[0][:-8]
-        sources = [tname]
-        for s in items[2:]:
-            if s.startswith('$(') and s.endswith(')'):
-                s = s[2:-1]
-            else:
-                s = "'%s'" % s
-            sources.append(s)
-        ofile.write('%s(%s)\n' % (func, ',\n'.join(sources)))
-
-    def process_autoconf(self, ofile, subdir):
-        ifile = open(os.path.join(subdir, 'configure.ac'))
-        languages = []
-        name = 'undetected'
-        outlines = []
-        for line in self.readlines(ifile, ','):
-            line = line.strip()
-            if line == 'AC_PROG_CC':
-                languages.append("'c'")
-            elif line == 'AC_PROG_CXX':
-                languages.append("'cpp'")
-            elif line.startswith('AC_INIT'):
-                line = line[8:]
-                if line[0] == '[':
-                    name = line.split(']')[0][1:]
-                else:
-                    name = line.split()[0]
-            elif line.startswith('#'):
-                outlines.append(line + '\n')
-            elif line.startswith('PKG_CHECK_MODULES'):
-                rest = line.split('(', 1)[-1].strip()
-                pkgstanza = rest.split()[1:]
-                for i in pkgstanza:
-                    i = i.strip()
-                    dep = None
-                    if '=' in i:
-                        continue
-                    if i.startswith('['):
-                        dep = i[1:]
-                    elif re.match('[a-zA-Z]', i):
-                        dep = i
-                    if dep is not None:
-                        outlines.append("%s_dep = dependency('%s')\n" % (dep, dep))
-            else:
-                outlines.append('# %s\n' % line)
-        ofile.write("project(%s)\n" % ', '.join(["'%s'" % name] + languages))
-        ofile.writelines(outlines)
-
-
-if __name__ == '__main__':
-    if len(sys.argv) != 2:
-        print(sys.argv[0], '<Autotools project root>')
-        sys.exit(1)
-    c = Converter(sys.argv[1])
-    c.convert()
diff --git a/tools/cmake2meson.py b/tools/cmake2meson.py
index f1720a86d..098a6e0c8 100755
--- a/tools/cmake2meson.py
+++ b/tools/cmake2meson.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 
 # Copyright 2014 Jussi Pakkanen