Commit 21bde92c9abb378f9c456a9d95e6f9b99ef8c920
2013-11-30T03:43:42
Darwin: Clean up, modernize generator scripts
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315
diff --git a/generate-ios-source-and-headers.py b/generate-ios-source-and-headers.py
index c2bca73..68d31d0 100644
--- a/generate-ios-source-and-headers.py
+++ b/generate-ios-source-and-headers.py
@@ -1,29 +1,42 @@
#!/usr/bin/env python
-
import subprocess
import re
import os
import errno
import collections
-import sys
+#developer_path =
+
class Platform(object):
pass
sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
+
def sdkinfo(sdkname):
ret = {}
for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
kv = line.strip().split(': ', 1)
if len(kv) == 2:
- k,v = kv
+ k, v = kv
ret[k] = v
return ret
+
+def mkdir_p(path):
+ try:
+ os.makedirs(path)
+ except OSError as exc: # Python >2.5
+ if exc.errno == errno.EEXIST:
+ pass
+ else:
+ raise
+
+
sim_sdk_info = sdkinfo('iphonesimulator')
device_sdk_info = sdkinfo('iphoneos')
+
def latest_sdks():
latest_sim = None
latest_device = None
@@ -39,20 +52,22 @@ def latest_sdks():
sim_sdk, device_sdk = latest_sdks()
+
class simulator_platform(Platform):
- sdk='iphonesimulator'
+ sdk = 'iphonesimulator'
arch = 'i386'
- name = 'simulator'
+ short_arch = arch
triple = 'i386-apple-darwin10'
sdkroot = sim_sdk_info['Path']
prefix = "#if !defined(__arm__) && defined(__i386__)\n\n"
suffix = "\n\n#endif"
+
class device_platform(Platform):
- sdk='iphoneos'
- name = 'ios'
+ sdk = 'iphoneos'
arch = 'armv7'
+ short_arch = 'arm'
triple = 'arm-apple-darwin10'
sdkroot = device_sdk_info['Path']
@@ -61,14 +76,12 @@ class device_platform(Platform):
def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
- if not os.path.exists(dst_dir):
- os.makedirs(dst_dir)
-
+ mkdir_p(dst_dir)
out_filename = filename
if file_suffix:
split_name = os.path.splitext(filename)
- out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
+ out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
with open(os.path.join(src_dir, filename)) as in_file:
with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
@@ -82,16 +95,15 @@ def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''
headers_seen = collections.defaultdict(set)
+
def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
for root, dirs, files in os.walk(src_dir, followlinks=True):
- relroot = os.path.relpath(root,src_dir)
+ relroot = os.path.relpath(root, src_dir)
def move_dir(arch, prefix='', suffix='', files=[]):
for file in files:
- file_suffix = None
if file.endswith('.h'):
if dest_include_dir:
- file_suffix = arch
if arch:
headers_seen[file].add(arch)
move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
@@ -109,42 +121,51 @@ def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None
move_dir(arch='arm',
prefix="#ifdef __arm__\n\n",
suffix="\n\n#endif",
- files=files)
+ files=['sysv.S', 'trampoline.S', 'ffi.c'])
elif relroot == 'x86':
move_dir(arch='i386',
prefix="#if !defined(__arm__) && defined(__i386__)\n\n",
suffix="\n\n#endif",
- files=files)
+ files=['darwin.S', 'ffi.c'])
+
def build_target(platform):
def xcrun_cmd(cmd):
return subprocess.check_output(['xcrun', '-sdk', platform.sdkroot, '-find', cmd]).strip()
- build_dir = 'build_' + platform.name
- if not os.path.exists(build_dir):
- os.makedirs(build_dir)
- env = dict(CC=xcrun_cmd('clang'),
- LD=xcrun_cmd('ld'),
- CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.0' % (platform.arch, platform.sdkroot))
- working_dir=os.getcwd()
- try:
- os.chdir(build_dir)
- subprocess.check_call(['../configure', '-host', platform.triple], env=env)
- move_source_tree('.', None, '../ios/include',
- arch=platform.arch,
- prefix=platform.prefix,
- suffix=platform.suffix)
- move_source_tree('./include', None, '../ios/include',
- arch=platform.arch,
- prefix=platform.prefix,
- suffix=platform.suffix)
- finally:
- os.chdir(working_dir)
-
- for header_name, archs in headers_seen.iteritems():
- basename, suffix = os.path.splitext(header_name)
+ build_dir = 'build_' + platform.short_arch
+ mkdir_p(build_dir)
+ env = dict(CC=xcrun_cmd('clang'),
+ LD=xcrun_cmd('ld'),
+ CFLAGS='-arch %s -isysroot %s -miphoneos-version-min=4.3' % (platform.arch, platform.sdkroot))
+ working_dir = os.getcwd()
+ try:
+ os.chdir(build_dir)
+ subprocess.check_call(['../configure', '-host', platform.triple], env=env)
+ move_source_tree('.', None, '../ios/include',
+ arch=platform.short_arch,
+ prefix=platform.prefix,
+ suffix=platform.suffix)
+ move_source_tree('./include', None, '../ios/include',
+ arch=platform.short_arch,
+ prefix=platform.prefix,
+ suffix=platform.suffix)
+ finally:
+ os.chdir(working_dir)
+
+ for header_name, archs in headers_seen.iteritems():
+ basename, suffix = os.path.splitext(header_name)
+
+
+def make_tramp():
+ with open('src/arm/trampoline.S', 'w') as tramp_out:
+ p = subprocess.Popen(['bash', 'src/arm/gentramp.sh'], stdout=tramp_out)
+ p.wait()
+
def main():
+ make_tramp()
+
move_source_tree('src', 'ios/src', 'ios/include')
move_source_tree('include', None, 'ios/include')
build_target(simulator_platform)
diff --git a/generate-osx-source-and-headers.py b/generate-osx-source-and-headers.py
index 64313c1..c664ec7 100644
--- a/generate-osx-source-and-headers.py
+++ b/generate-osx-source-and-headers.py
@@ -2,26 +2,27 @@
import subprocess
import re
import os
-import errno
import collections
-import sys
+
class Platform(object):
pass
sdk_re = re.compile(r'.*-sdk ([a-zA-Z0-9.]*)')
+
def sdkinfo(sdkname):
ret = {}
for line in subprocess.Popen(['xcodebuild', '-sdk', sdkname, '-version'], stdout=subprocess.PIPE).stdout:
kv = line.strip().split(': ', 1)
if len(kv) == 2:
- k,v = kv
+ k, v = kv
ret[k] = v
return ret
desktop_sdk_info = sdkinfo('macosx')
+
def latest_sdks():
latest_desktop = None
for line in subprocess.Popen(['xcodebuild', '-showsdks'], stdout=subprocess.PIPE).stdout:
@@ -34,8 +35,9 @@ def latest_sdks():
desktop_sdk = latest_sdks()
+
class desktop_platform_32(Platform):
- sdk='macosx'
+ sdk = 'macosx'
arch = 'i386'
name = 'mac32'
triple = 'i386-apple-darwin10'
@@ -44,8 +46,9 @@ class desktop_platform_32(Platform):
prefix = "#if defined(__i386__) && !defined(__x86_64__)\n\n"
suffix = "\n\n#endif"
+
class desktop_platform_64(Platform):
- sdk='macosx'
+ sdk = 'macosx'
arch = 'x86_64'
name = 'mac'
triple = 'x86_64-apple-darwin10'
@@ -54,6 +57,7 @@ class desktop_platform_64(Platform):
prefix = "#if !defined(__i386__) && defined(__x86_64__)\n\n"
suffix = "\n\n#endif"
+
def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''):
if not os.path.exists(dst_dir):
os.makedirs(dst_dir)
@@ -62,7 +66,7 @@ def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''
if file_suffix:
split_name = os.path.splitext(filename)
- out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
+ out_filename = "%s_%s%s" % (split_name[0], file_suffix, split_name[1])
with open(os.path.join(src_dir, filename)) as in_file:
with open(os.path.join(dst_dir, out_filename), 'w') as out_file:
@@ -76,16 +80,15 @@ def move_file(src_dir, dst_dir, filename, file_suffix=None, prefix='', suffix=''
headers_seen = collections.defaultdict(set)
+
def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None, suffix=None):
for root, dirs, files in os.walk(src_dir, followlinks=True):
- relroot = os.path.relpath(root,src_dir)
+ relroot = os.path.relpath(root, src_dir)
def move_dir(arch, prefix='', suffix='', files=[]):
for file in files:
- file_suffix = None
if file.endswith('.h'):
if dest_include_dir:
- file_suffix = arch
if arch:
headers_seen[file].add(arch)
move_file(root, dest_include_dir, file, arch, prefix=prefix, suffix=suffix)
@@ -103,11 +106,12 @@ def move_source_tree(src_dir, dest_dir, dest_include_dir, arch=None, prefix=None
move_dir(arch='i386',
prefix="#if defined(__i386__) && !defined(__x86_64__)\n\n",
suffix="\n\n#endif",
- files=files)
+ files=['darwin.S', 'ffi.c'])
move_dir(arch='x86_64',
prefix="#if !defined(__i386__) && defined(__x86_64__)\n\n",
suffix="\n\n#endif",
- files=files)
+ files=['darwin64.S', 'ffi64.c'])
+
def build_target(platform):
def xcrun_cmd(cmd):
@@ -119,7 +123,7 @@ def build_target(platform):
env = dict(CC=xcrun_cmd('clang'),
LD=xcrun_cmd('ld'),
CFLAGS='-arch %s -isysroot %s -mmacosx-version-min=10.6' % (platform.arch, platform.sdkroot))
- working_dir=os.getcwd()
+ working_dir = os.getcwd()
try:
os.chdir(build_dir)
subprocess.check_call(['../configure', '-host', platform.triple], env=env)
@@ -137,6 +141,7 @@ def build_target(platform):
for header_name, archs in headers_seen.iteritems():
basename, suffix = os.path.splitext(header_name)
+
def main():
move_source_tree('src', 'osx/src', 'osx/include')
move_source_tree('include', None, 'osx/include')