author Simon Whitehead <>
Sat, 13 May 2017 15:12:15 -0500
changeset 358329 633151f5d481d49bd39900d43e6a75d77459a7bb
parent 247354 30c3929cef76c68d69083cef120d33000819ae3c
permissions -rwxr-xr-x
servo: Merge #16829 - Disallow negative duration for animation and transition (from hiikezoe:disallow-negative-duration); r=emilio <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15343 <!-- Either: --> - [X] There are tests for these changes written by @simon-whitehead . Thank you! <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: Source-Revision: 4613c0382ab76263fb8202ccf52f4c0520e44809

# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at

# Usage: ./ <sphinxbase_directory>
# Copies the needed files from a directory containing the original
# sphinxbase source, and applies any local patches we're carrying.

# Create config.h
echo "#if (  defined(_WIN32) || defined(__CYGWIN__) )" > config.h
cat $1/include/win32/config.h >> config.h
echo "#else" >> config.h
cat $1/include/android/config.h >> config.h
echo "#endif" >> config.h

# Create sphinx_config.h
echo "#if (  defined(_WIN32) || defined(__CYGWIN__) )" > sphinx_config.h
cat $1/include/win32/sphinx_config.h >> sphinx_config.h
echo "#else" >> sphinx_config.h
cat $1/include/android/sphinx_config.h >> sphinx_config.h
echo "#endif" >> sphinx_config.h
sed -i '' -e 's/#define HAVE_LONG_LONG 1/\/*#define HAVE_LONG_LONG 1*\//g' sphinx_config.h

# Copy created file
cp sphinx_config.h sphinxbase/sphinx_config.h

# Copy source files
cp $1/include/sphinxbase/*.h sphinxbase/
cp $1/src/libsphinxbase/fe/*.c src/libsphinxbase/fe/
cp $1/src/libsphinxbase/fe/*.h src/libsphinxbase/fe/
cp $1/src/libsphinxbase/feat/*.c src/libsphinxbase/feat/
cp $1/src/libsphinxbase/lm/*.c src/libsphinxbase/lm/
cp $1/src/libsphinxbase/lm/*.h src/libsphinxbase/lm/
cp $1/src/libsphinxbase/util/*.c src/libsphinxbase/util/

# Apply any patches against upstream here.
patch -l -p1 < sbthread.patch