diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/file_packager.py | 4 | ||||
| -rw-r--r-- | tools/shared.py | 24 |
2 files changed, 27 insertions, 1 deletions
diff --git a/tools/file_packager.py b/tools/file_packager.py index 3844b4ae..8c1e0a43 100644 --- a/tools/file_packager.py +++ b/tools/file_packager.py @@ -182,6 +182,10 @@ if crunch: except: format = [] Popen([CRUNCH, '-file', file_['name'], '-quality', crunch] + format, stdout=sys.stderr).communicate() + #if not os.path.exists(os.path.basename(crunch_name)): + # print >> sys.stderr, 'Failed to crunch, perhaps a weird dxt format? Looking for a source PNG for the DDS' + # Popen([CRUNCH, '-file', unsuffixed(file_['name']) + '.png', '-quality', crunch] + format, stdout=sys.stderr).communicate() + assert os.path.exists(os.path.basename(crunch_name)), 'crunch failed to generate output' shutil.move(os.path.basename(crunch_name), crunch_name) # crunch places files in the current dir # prepend the dds header crunched = open(crunch_name, 'rb').read() diff --git a/tools/shared.py b/tools/shared.py index 997c0ad9..4ab54273 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -43,12 +43,31 @@ except Exception, e: print >> sys.stderr, 'Error in evaluating %s (at %s): %s, text: %s' % (EM_CONFIG, CONFIG_FILE, str(e), config_text) sys.exit(1) +# Expectations + +EXPECTED_LLVM_VERSION = (3,1) + +def check_llvm_version(): + try: + expected = 'clang version ' + '.'.join(map(str, EXPECTED_LLVM_VERSION)) + actual = Popen([CLANG, '-v'], stderr=PIPE).communicate()[1].split('\n')[0][0:len(expected)] + if expected != actual: + print >> sys.stderr, 'warning: LLVM version appears incorrect (seeing "%s", expected "%s")' % (actual, expected) + except Exception, e: + print >> sys.stderr, 'warning: Could not verify LLVM version: %s' % str(e) + # Check that basic stuff we need (a JS engine to compile, Node.js, and Clang and LLVM) # exists. # The test runner always does this check (through |force|). emcc does this less frequently, # only when ${EM_CONFIG}_sanity does not exist or is older than EM_CONFIG (so, # we re-check sanity when the settings are changed) def check_sanity(force=False): + check_llvm_version() # just a warning, not a fatal check - do it even if EM_IGNORE_SANITY is on + + if os.environ.get('EM_IGNORE_SANITY'): + print >> sys.stderr, 'EM_IGNORE_SANITY set, ignoring sanity checks' + return + try: if not force: if not CONFIG_FILE: @@ -200,6 +219,7 @@ if USE_EMSDK: # allows projects to override them) # Note that -nostdinc++ is not needed, since -nostdinc implies that! EMSDK_OPTS = ['-nostdinc', '-Xclang', '-nobuiltininc', '-Xclang', '-nostdsysteminc', + '-Xclang', '-isystem' + path_from_root('system', 'local', 'include'), '-Xclang', '-isystem' + path_from_root('system', 'include'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'emscripten'), '-Xclang', '-isystem' + path_from_root('system', 'include', 'bsd'), # posix stuff @@ -424,7 +444,7 @@ class Building: env['CXX'] = EMXX if not WINDOWS else 'python %r' % EMXX env['AR'] = EMAR if not WINDOWS else 'python %r' % EMAR env['RANLIB'] = EMRANLIB if not WINDOWS else 'python %r' % EMRANLIB - env['LIBTOOL'] = EMLIBTOOL if not WINDOWS else 'python %r' % EMLIBTOOL + #env['LIBTOOL'] = EMLIBTOOL if not WINDOWS else 'python %r' % EMLIBTOOL env['EMMAKEN_COMPILER'] = Building.COMPILER env['EMSCRIPTEN_TOOLS'] = path_from_root('tools') env['CFLAGS'] = env['EMMAKEN_CFLAGS'] = ' '.join(Building.COMPILER_TEST_OPTS) @@ -432,6 +452,8 @@ class Building: env['HOST_CXX'] = CLANG_CPP env['HOST_CFLAGS'] = "-W" #if set to nothing, CFLAGS is used, which we don't want env['HOST_CXXFLAGS'] = "-W" #if set to nothing, CXXFLAGS is used, which we don't want + env['PKG_CONFIG_LIBDIR'] = path_from_root('system', 'local', 'lib', 'pkgconfig') + os.path.pathsep + path_from_root('system', 'lib', 'pkgconfig') + env['PKG_CONFIG_PATH'] = os.environ.get ('EM_PKG_CONFIG_PATH') or '' return env @staticmethod |