diff options
| author |  bungeman <bungeman@google.com> | 2016-03-09 07:42:54 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 07:42:54 -0800 |
| commit | 51190df040c5a81bb82b9cd5b95f07a39d0e602b (patch) | |
| tree | cf344dc20df2b26b7683e19530124cdba854c5a5 /third_party/libmicrohttpd | |
| parent | c3adf2fb41d8f2be2724a998ed2aa03b48a10a99 (diff) | |
Add SkDrawPosTextHCommand JSON, fix skiaserve build.
Adds SkDrawPosTextHCommand ::fromJSON and ::toJSON.
Both SkDrawPosTextCommand and SkDrawPosTextHCommand's
::toJSON write the correct number of positions, preventing reading
uninitialized memory.
The microhttpd build is now done in the build tree as opposed to in a
temporary directory.
The microhttpd build script uses os.path.join so that absolute paths
do not confuse the build. This allows compatibility with the cmake
gyp generator as CMake likes to pass absolute paths.
The microhttpd gyp target is now marked as 'none' since it is not
a 'static_library' target (which directs gyp to compile sources into
a static library). The dependencies to the action are updated to the
minimum required for sane re-building.
The everything gyp target now depends on the skiaserve gyp target.
This means that when using skia_build_server=1, building 'most' will
build skiaserve, but when skia_build_server is not defined the
skiaserve target will still be available if specified manually.
The old json.gyp is removed as it currently does not build anything.
All of the files currently referenced by it as sources no longer exist.
Review URL: https://codereview.chromium.org/1775203002
Diffstat (limited to 'third_party/libmicrohttpd')
| -rw-r--r-- | third_party/libmicrohttpd/build.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/third_party/libmicrohttpd/build.py b/third_party/libmicrohttpd/build.py index cafcbeac88..f09a360204 100644 --- a/third_party/libmicrohttpd/build.py +++ b/third_party/libmicrohttpd/build.py @@ -13,13 +13,19 @@ import tempfile parser = argparse.ArgumentParser() parser.add_argument("--src", help="microhttpd src directory") -parser.add_argument("--dst", help="output for build files") +parser.add_argument("--out", help="build directory") +parser.add_argument("--dst", help="output for final build products") args = parser.parse_args() -temp_dir = tempfile.mkdtemp() +out_dir = args.out cwd = os.getcwd() -os.chdir(temp_dir) -call([cwd + "/" + args.src + "/configure", +try: + os.makedirs(out_dir) +except OSError as e: + pass + +os.chdir(out_dir) +call([os.path.join(cwd, args.src, "configure"), "--disable-doc", "--disable-examples", "--enable-https=no", @@ -28,7 +34,5 @@ call([cwd + "/" + args.src + "/configure", "--enable-shared=no"]) call(["make", "--silent"]) call(["cp", - temp_dir + "/src/microhttpd/.libs/libmicrohttpd.a", - cwd + "/" + args.dst]) -shutil.rmtree(temp_dir) - + "src/microhttpd/.libs/libmicrohttpd.a", + os.path.join(cwd, args.dst)]) |