Commitef78f55

committed

Move dependencies install command to script section

1 parent4a61763 commitef78f55Copy full SHA for ef78f55

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,15 +92,14 @@ before_script:`
`92`	`92`	`-uname -a`
`93`	`93`
`94`	`94`	`-cd ${TRAVIS_BUILD_DIR}`
`95`		`-`
`96`	`95`	`# install coverage tools`
`97`	`96`	`-if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi`
`98`	`97`
	`98`	`+script:`
`99`	`99`	`# install avtranscoder dependencies`
`100`	`100`	`-if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi`
`101`	`101`	`-if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi`
`102`	`102`
`103`		`-script:`
`104`	`103`	`# build`
`105`	`104`	`-./tools/travis/build.sh`
`106`	`105`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ if [ -z ${TRAVIS_JOB_ID} ] \|\| [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then`
`12`	`12`	`export LD_LIBRARY_PATH=${DEPENDENCY_INSTALL_PATH}/lib:${DEPENDENCY_INSTALL_PATH}/lib64`
`13`	`13`	`export PKG_CONFIG_PATH=${DEPENDENCY_INSTALL_PATH}/lib/pkgconfig:${DEPENDENCY_INSTALL_PATH}/lib64/pkgconfig`
`14`	`14`	`export PATH=$PATH:${DEPENDENCY_INSTALL_PATH}/bin`
	`15`	`+echo"Build log file:${DEPENDENCY_LOG_FILE}"`
`15`	`16`
`16`	`17`	`# yasm`
`17`	`18`	`echo"Building YASM (${YASM_VERSION})"`

Comments

(0)