Skip to content

Commit a546c1f

Browse files
committed
Merge pull request #210 from cchampet/deploy_rename_ressource_to_avprofiles
Deploy: rename 'ressource' folder to 'avprofiles'
2 parents 4122382 + 5659934 commit a546c1f

27 files changed

+3
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ add_definitions(-DAVTRANSCODER_VERSION_MINOR=${AVTRANSCODER_VERSION_MINOR})
1414
add_definitions(-DAVTRANSCODER_VERSION_MICRO=${AVTRANSCODER_VERSION_MICRO})
1515

1616
# Define AvTranscoder default path to profiles
17-
add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/ressource")
17+
add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/avprofiles")
1818

1919
# Diplay commands being ran by CMake
2020
set(CMAKE_VERBOSE_MAKEFILE OFF)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ install(
5252
install(TARGETS avtranscoder-static DESTINATION lib/ OPTIONAL)
5353
install(TARGETS avtranscoder-shared DESTINATION lib/ OPTIONAL)
5454

55-
### Install AvTranscoder ressource
55+
### Install AvTranscoder avprofiles
5656
install(
57-
DIRECTORY "${PROJECT_SOURCE_DIR}/ressource"
57+
DIRECTORY "${PROJECT_SOURCE_DIR}/avprofiles"
5858
DESTINATION "share"
5959
FILES_MATCHING
6060
PATTERN "*.prf"

tools/travis.python.nosetests.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
55
export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
66

7-
# Get avtranscoder profiles
8-
export AVPROFILES=${AVTRANSCODER_INSTALL}/share/ressource
9-
107
# Get assets
118
git clone https://github.com/avTranscoder/avTranscoder-data.git
129
export AVTRANSCODER_TEST_VIDEO_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_480p_stereo.avi

0 commit comments

Comments
 (0)