diff options
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 | ||||
| -rwxr-xr-x | ppapi/generators/idl_c_header.py | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 5c4315b..7efb156 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -242,6 +242,8 @@ HEADER_MAP = { 'irt.h': 'src/untrusted/irt/irt.h', 'irt_ppapi.h': 'src/untrusted/irt/irt_ppapi.h', }, + 'libs': { + }, } @@ -615,6 +617,7 @@ def main(args): buildbot_common.RemoveDir(pepperold) if not skip_untar: buildbot_common.RemoveDir(pepperdir) + buildbot_common.MakeDir(os.path.join(pepperdir, 'libraries')) buildbot_common.MakeDir(os.path.join(pepperdir, 'toolchain')) buildbot_common.MakeDir(os.path.join(pepperdir, 'tools')) else: @@ -633,6 +636,7 @@ def main(args): if not skip_build: BuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains) + InstallHeaders(os.path.join(pepperdir, 'libraries'), pepper_ver, 'libs') if not skip_build: buildbot_common.BuildStep('Copy make OS helpers') @@ -668,7 +672,7 @@ def main(args): BuildUpdater() # start local server sharing a manifest + the new bundle - if not skip_test_updater: + if not skip_test_updater and not skip_tar: buildbot_common.BuildStep('Move bundle to localserver dir') buildbot_common.MakeDir(SERVER_DIR) buildbot_common.Move(tarfile, SERVER_DIR) diff --git a/ppapi/generators/idl_c_header.py b/ppapi/generators/idl_c_header.py index 6584ef4..d6d897e 100755 --- a/ppapi/generators/idl_c_header.py +++ b/ppapi/generators/idl_c_header.py @@ -7,6 +7,7 @@ import glob import os +import re import sys from idl_log import ErrOut, InfoOut, WarnOut @@ -172,6 +173,15 @@ class HGen(GeneratorByFile): if include == cur_include: continue out.Write('#include "%s"\n' % include) + # If we are generating a single release, then create a macro for the highest + # available release number. + if filenode.GetProperty('NAME').endswith('pp_macros.idl'): + releasestr = GetOption('release') + if releasestr: + release_numbers = re.findall('\d+', releasestr) + if release_numbers: + out.Write('\n#define PPAPI_RELEASE %s\n' % release_numbers[0]) + # Generate all interface defines out.Write('\n') for node in filenode.GetListOf('Interface'): |