diff options
Diffstat (limited to 'run')
| -rwxr-xr-x | run/dcpomatic_player | 9 | ||||
| -rwxr-xr-x | run/dcpomatic_playlist | 8 | ||||
| -rwxr-xr-x | run/dcpomatic_verifier | 24 | ||||
| -rw-r--r-- | run/environment | 3 | ||||
| -rwxr-xr-x | run/tests | 81 | ||||
| -rw-r--r-- | run/tests.bat | 2 |
6 files changed, 85 insertions, 42 deletions
diff --git a/run/dcpomatic_player b/run/dcpomatic_player index 0c565c251..23d2dc3d8 100755 --- a/run/dcpomatic_player +++ b/run/dcpomatic_player @@ -4,6 +4,15 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $DIR/environment binary=build/src/tools/dcpomatic2_player +if [[ "$(uname -m)" == arm64 ]]; then + env=arm64/11.0 +else + env=x86_64/10.10 +fi + +echo $env +export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib + if [ "$1" == "--debug" ]; then shift gdb --args build/src/tools/dcpomatic2_player $* diff --git a/run/dcpomatic_playlist b/run/dcpomatic_playlist index a23c45766..134a1047e 100755 --- a/run/dcpomatic_playlist +++ b/run/dcpomatic_playlist @@ -4,6 +4,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" source $DIR/environment binary=build/src/tools/dcpomatic2_playlist +if [[ "$(uname -m)" == arm64 ]]; then + env=arm64/11.0 +else + env=x86_64/10.10 +fi + +export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib + if [ "$1" == "--debug" ]; then shift gdb --args $binary $* diff --git a/run/dcpomatic_verifier b/run/dcpomatic_verifier new file mode 100755 index 000000000..a87c3d4dc --- /dev/null +++ b/run/dcpomatic_verifier @@ -0,0 +1,24 @@ +#!/bin/bash + +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +source $DIR/environment +binary=$build/src/tools/dcpomatic2_verifier + +if [[ "$(uname -m)" == arm64 ]]; then + env=arm64/11.0 +else + env=x86_64/10.10 +fi + +export DYLD_LIBRARY_PATH=/Users/cah/osx-environment/$env/lib:/usr/local/lib + +if [ "$1" == "--debug" ]; then + shift + if [[ "$(uname)" == Darwin ]]; then + /Applications/Xcode.app/Contents/Developer/usr/bin/lldb $binary $* + else + gdb --args $binary $* + fi +else + $binary $* 2> >(grep -v Gtk-CRITICAL | grep -v Gtk-WARNING) +fi diff --git a/run/environment b/run/environment index dac7bef55..822e0603a 100644 --- a/run/environment +++ b/run/environment @@ -1,6 +1,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" build=$DIR/../build -export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH +env=$DIR/../../.. +export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$env/lib:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH if [[ $(readlink -f $DIR/..) =~ (.*build/[^/]*) ]]; then export LD_LIBRARY_PATH=${BASH_REMATCH[1]}/lib:$LD_LIBRARY_PATH fi @@ -5,6 +5,9 @@ set -e PRIVATE_GIT="881c48805e352dfe150993814757ca974282be18" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +source $DIR/environment + type="" check=0 while [[ $# -gt 0 ]]; do @@ -53,52 +56,50 @@ while [[ $# -gt 0 ]]; do done if [ "$(uname)" == "Linux" ]; then - export LD_LIBRARY_PATH=build/src/lib:/usr/local/lib:/usr/local/lib64:$LD_LIBRARY_PATH - rm -f build/test/dcpomatic2_openssl - # This must be our patched openssl or tests will fail - if [ ! -f build/test/dcpomatic2_openssl ]; then - ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl - fi - export DCPOMATIC_TEST_TOOLS_PATH=/opt/asdcplib/bin - if [ -f /src/backports/dcp_inspect ]; then - export DCPOMATIC_DCP_INSPECT=/src/backports/dcp_inspect - fi - set +e - python3 -m clairmeta.cli --help > /dev/null 2>&1 - if [ "$?" == "0" ]; then - export DCPOMATIC_CLAIRMETA=1 - fi - set -e + rm -f build/test/dcpomatic2_openssl + mkdir -p build/test + # This must be our patched openssl or tests will fail + if [ ! -f build/test/dcpomatic2_openssl ]; then + ln -s ../../../openssl/apps/openssl build/test/dcpomatic2_openssl + fi + export DCPOMATIC_TEST_TOOLS_PATH=/opt/asdcplib/bin + if [ -f /src/backports/dcp_inspect ]; then + export DCPOMATIC_DCP_INSPECT=/src/backports/dcp_inspect + fi + set +e + python3 -m clairmeta.cli --help > /dev/null 2>&1 + if [ "$?" == "0" ]; then + export DCPOMATIC_CLAIRMETA=1 + fi + set -e fi if [ "$(uname)" == "Darwin" ]; then - resources=build/Resources - rm -rf $resources - mkdir -p $resources - cp fonts/*.ttf $resources - cp -r ../libdcp/tags $resources - cp -r ../libdcp/xsd $resources - cp ../libdcp/ratings $resources - rm -f build/test/openssl - ln -s ../../../openssl/apps/openssl build/test/openssl - # SIP stops this being passed in from the caller's environment - export DYLD_LIBRARY_PATH=$environment/x86_64/10.10/lib:/Users/ci/workspace/lib - # We need to find ffcmp in here - export PATH=$PATH:/Users/ci/workspace/bin + resources=build/Resources + rm -rf $resources + mkdir -p $resources + cp fonts/*.ttf $resources + cp -r ../libdcp/tags $resources + cp -r ../libdcp/xsd $resources + cp ../libdcp/ratings $resources + rm -f build/test/openssl + ln -s ../../../openssl/apps/openssl build/test/openssl + # We need to find ffcmp in here + export PATH=$PATH:/Users/ci/workspace/bin fi if [ "$check" == "1" ]; then - if [ "$DCPOMATIC_TEST_PRIVATE" == "" ]; then - pushd ../dcpomatic-test-private - else - pushd $DCPOMATIC_TEST_PRIVATE - fi - current=$(git rev-parse HEAD) - if [ "$current" != "$PRIVATE_GIT" ]; then - echo "Unexpected dcpomatic-test-private version" - exit 1 - fi - popd + if [ "$DCPOMATIC_TEST_PRIVATE" == "" ]; then + pushd ../dcpomatic-test-private + else + pushd $DCPOMATIC_TEST_PRIVATE + fi + current=$(git rev-parse HEAD) + if [ "$current" != "$PRIVATE_GIT" ]; then + echo "Unexpected dcpomatic-test-private version" + exit 1 + fi + popd fi if [ "$type" == "debug" ]; then diff --git a/run/tests.bat b/run/tests.bat index a9d921788..92030e61c 100644 --- a/run/tests.bat +++ b/run/tests.bat @@ -1,4 +1,4 @@ -set PATH=%PATH%;c:\users\ci\bin;c:\users\ci\workspace\dcpomatic\bin;c:\users\ci\workspace\dcpomatic\lib +set PATH=%PATH%;c:\users\ci\bin_v2.17.x;c:\users\ci\workspace\dcpomatic\bin;c:\users\ci\workspace\dcpomatic\lib set DCPOMATIC_TEST_PRIVATE=c:\users\ci\dcpomatic-test-private xcopy ..\libdcp\tags build\tags\ copy ..\libdcp\ratings build\ |