Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc584b91

Browse files
committed
Move dependencies install command to script section
1 parent4a61763 commitc584b91

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ before_script:
9696
# install coverage tools
9797
-if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
9898

99+
100+
script:
99101
# install avtranscoder dependencies
100102
-if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
101103
-if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
102104

103-
script:
104105
# build
105106
-./tools/travis/build.sh
106107

‎tools/travis/linux.install.deps.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
1212
export LD_LIBRARY_PATH=${DEPENDENCY_INSTALL_PATH}/lib:${DEPENDENCY_INSTALL_PATH}/lib64
1313
export PKG_CONFIG_PATH=${DEPENDENCY_INSTALL_PATH}/lib/pkgconfig:${DEPENDENCY_INSTALL_PATH}/lib64/pkgconfig
1414
export PATH=$PATH:${DEPENDENCY_INSTALL_PATH}/bin
15+
echo"Build log file:${DEPENDENCY_LOG_FILE}"
1516

1617
# yasm
1718
echo"Building YASM (${YASM_VERSION})"
@@ -21,6 +22,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
2122
cd yasm-${YASM_VERSION}&& \
2223
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin"&& \
2324
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
25+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
2426
make install&& \
2527
rm -rf${DIR}
2628

@@ -32,6 +34,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
3234
cd x264&& \
3335
./configure --prefix="$DEPENDENCY_INSTALL_PATH" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-shared --disable-asm&& \
3436
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
37+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
3538
make install&& \
3639
rm -rf${DIR}
3740

@@ -44,6 +47,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
4447
cd lame-${LAME_VERSION}&& \
4548
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin" --enable-nasm&& \
4649
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
50+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
4751
make install&& \
4852
rm -rf${DIR}
4953

@@ -74,6 +78,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
7478
cd xvidcore/build/generic&& \
7579
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --bindir="${DEPENDENCY_INSTALL_PATH}/bin"&& \
7680
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
81+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
7782
make install&& \
7883
rm -rf${DIR}
7984

@@ -101,6 +106,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
101106
cd libogg-${OGG_VERSION}&& \
102107
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --disable-shared --with-pic&& \
103108
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
109+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
104110
make install&& \
105111
rm -rf${DIR}
106112

@@ -113,6 +119,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
113119
cd libvorbis-${VORBIS_VERSION}&& \
114120
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --with-ogg="${DEPENDENCY_INSTALL_PATH}" --disable-shared --with-pic&& \
115121
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
122+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
116123
make install&& \
117124
rm -rf${DIR}
118125

@@ -140,6 +147,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
140147
git checkout v${VPX_VERSION}&& \
141148
./configure --prefix="${DEPENDENCY_INSTALL_PATH}" --disable-examples --enable-pic&& \
142149
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
150+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
143151
make install&& \
144152
rm -rf${DIR}
145153

@@ -177,6 +185,7 @@ if [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
177185
$LICENSING_OPTIONS \
178186
$THIRD_PARTIES_OPTIONS --enable-postproc&& \
179187
make -k>${DEPENDENCY_LOG_FILE}2>&1&& \
188+
if [$?!= 0 ];then cat${DEPENDENCY_LOG_FILE}&&exit 1;fi
180189
make install&& \
181190
rm -rf${DIR}
182191

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp