Tidy up the run/ directory a little.

diff --git a/run/dcpomatic b/run/dcpomatic
index 639e880984debf66208a1004bd917e4c10c46546..8da7d7fab2fcc38cbffb7cc658764c569ed2bb34 100755 (executable)
--- a/run/dcpomatic
+++ b/run/dcpomatic
@@ -1,11 +1,9 @@
 #!/bin/bash
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-build=$DIR/../build
-export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib
-export DCPOMATIC_GRAPHICS=$DIR/../graphics
+source $DIR/environment
 binary=$build/src/tools/dcpomatic2
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $binary $*

diff --git a/run/dcpomatic_batch b/run/dcpomatic_batch
index 6a8207c14a602710ec040cb245247c6ae832e16a..6ff689ecf47c87e4bc52cb5cb30da729af8a1c2c 100755 (executable)
--- a/run/dcpomatic_batch
+++ b/run/dcpomatic_batch
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_batch $*

diff --git a/run/dcpomatic_cli b/run/dcpomatic_cli
index b24090db9d91cf6c5475e3bbfbfab8772714689e..9a5cae647a7631760d5971c54f0738c3475b7c7e 100755 (executable)
--- a/run/dcpomatic_cli
+++ b/run/dcpomatic_cli
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
 
-export LD_LIBRARY_PATH=build/src/lib:build/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_cli "$@"

diff --git a/run/dcpomatic_combiner b/run/dcpomatic_combiner
index a685c864ab2d42c740072232f9fbe1acfe3450b6..12da46c1ffe4184cf454097db3305ffe4223032e 100755 (executable)
--- a/run/dcpomatic_combiner
+++ b/run/dcpomatic_combiner
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib
-export DCPOMATIC_GRAPHICS=graphics
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_combiner $*

diff --git a/run/dcpomatic_create b/run/dcpomatic_create
index 7f88082bd02a7583b7439336abbeaf4417ed0c9f..693f9a05d10b7c9f0b23aafeffd373c4046a5fef 100755 (executable)
--- a/run/dcpomatic_create
+++ b/run/dcpomatic_create
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_create $*

diff --git a/run/dcpomatic_disk b/run/dcpomatic_disk
index 591fc01fe3c69d49616c41e1bb7ec6db33f9beb5..a4b4ead55f8907273db321bcb9ae875c0725516b 100755 (executable)
--- a/run/dcpomatic_disk
+++ b/run/dcpomatic_disk
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$HOME/osx-environment/x86_64/lib
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_disk $*

diff --git a/run/dcpomatic_disk_writer b/run/dcpomatic_disk_writer
index 6d20f3ae46391ac34d63f07091f1be621b8e6b6e..b2e1a872ddee4dbc3fd442e801e1d5fabc589943 100755 (executable)
--- a/run/dcpomatic_disk_writer
+++ b/run/dcpomatic_disk_writer
@@ -1,10 +1,12 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$HOME/osx-environment/x86_64/lib
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 exe=build/src/tools/dcpomatic2_disk_writer
 sudo chown root $exe
 sudo chmod 4755 $exe
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args $exe $*

diff --git a/run/dcpomatic_ecinema b/run/dcpomatic_ecinema
deleted file mode 100755 (executable)
index 3c739c0..0000000
--- a/run/dcpomatic_ecinema
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:/Users/c.hetherington/osx-environment/64/lib
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/dcpomatic2_ecinema $*
-elif [ "$1" == "--valgrind" ]; then
-    shift
-    valgrind --tool="memcheck" build/src/tools/dcpomatic2_ecinema $*
-elif [ "$1" == "--callgrind" ]; then
-    shift
-    valgrind --tool="callgrind" build/src/tools/dcpomatic2_ecinema $*
-elif [ "$1" == "--massif" ]; then
-    shift
-    valgrind --tool="massif" build/src/tools/dcpomatic2_ecinema $*
-elif [ "$1" == "--i18n" ]; then
-    shift
-    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 LC_ALL=fr_FR.UTF8 build/src/tools/dcpomatic2_ecinema "$*"
-elif [ "$1" == "--perf" ]; then
-    shift
-    perf record build/src/tools/dcpomatic2_ecinema $*
-else
-    build/src/tools/dcpomatic2_ecinema $*
-fi

diff --git a/run/dcpomatic_editor b/run/dcpomatic_editor
index 28ef4a9d27702074958a9634bc57c958387e37fa..af2a8a83687d1ddcda4d4895368bcf7239829814 100755 (executable)
--- a/run/dcpomatic_editor
+++ b/run/dcpomatic_editor
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib
-export DCPOMATIC_GRAPHICS=graphics
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_editor $*

diff --git a/run/dcpomatic_kdm b/run/dcpomatic_kdm
index b523f01c6452d453c5696b3a457e7cf5edf1e385..d0160ef7a3997a0db9a90167a34e42b9ec15eea1 100755 (executable)
--- a/run/dcpomatic_kdm
+++ b/run/dcpomatic_kdm
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:/carl/Environment/64/lib
-export DCPOMATIC_GRAPHICS=graphics
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_kdm $*

diff --git a/run/dcpomatic_kdm_cli b/run/dcpomatic_kdm_cli
index 0f75232cb68696c459658e67b5dac1bc5da51cb3..e9d0f300ad26ff3d99a6d2a182c4163d7f1fd563 100755 (executable)
--- a/run/dcpomatic_kdm_cli
+++ b/run/dcpomatic_kdm_cli
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-cd "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
 
-export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH:build/src
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_kdm_cli "$@"

diff --git a/run/dcpomatic_player b/run/dcpomatic_player
index 168fa9bb10f131c63405f855f5fcdceca81181ba..1c8a69b9eec1a5288c9923a83a378fe37d151094 100755 (executable)
--- a/run/dcpomatic_player
+++ b/run/dcpomatic_player
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib
-export DCPOMATIC_GRAPHICS=graphics
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_player $*

diff --git a/run/dcpomatic_playlist b/run/dcpomatic_playlist
index 3de040e00fb91c78bc73b3fb5e8984e27ce5bf49..e240aab9cc96110b5edbcf5a6fd4f3725fe39aa5 100755 (executable)
--- a/run/dcpomatic_playlist
+++ b/run/dcpomatic_playlist
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/home/c.hetherington/lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:/Users/c.hetherington/osx-environment/64/lib
-export DCPOMATIC_GRAPHICS=graphics
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_playlist $*

diff --git a/run/dcpomatic_server b/run/dcpomatic_server
index 212b599d93b126ae8c50600987b0bda927261723..8de760cc069d5d941ffd0f356e492e011fabd443 100755 (executable)
--- a/run/dcpomatic_server
+++ b/run/dcpomatic_server
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:build/src/wx:$LD_LIBRARY_PATH
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     gdb --args build/src/tools/dcpomatic2_server
 elif [ "$1" == "--valgrind" ]; then

diff --git a/run/dcpomatic_server_cli b/run/dcpomatic_server_cli
index f7f7f1a8d1a242606143ab99faf1b60e38033667..b1dffe079571524003bf896596d3ec7738c22389 100755 (executable)
--- a/run/dcpomatic_server_cli
+++ b/run/dcpomatic_server_cli
@@ -1,6 +1,8 @@
 #!/bin/bash
 
-export LD_LIBRARY_PATH=build/src/lib:/home/c.hetherington/lib:$LD_LIBRARY_PATH
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $DIR/environment
+
 if [ "$1" == "--debug" ]; then
     shift
     gdb --args build/src/tools/dcpomatic2_server_cli $*

diff --git a/run/environment b/run/environment
new file mode 100644 (file)
index 0000000..0e74572
--- /dev/null
+++ b/run/environment
@@ -0,0 +1,6 @@
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+build=$DIR/../build
+export LD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/usr/local/lib64:/usr/local/lib:$LD_LIBRARY_PATH
+export DYLD_LIBRARY_PATH=$build/src/lib:$build/src/wx:$build/src/asdcplib/src:/Users/ci/osx-environment/x86_64/10.10/lib:/Users/ci/workspace/lib
+DCPOMATIC_GRAPHICS=$DIR/../graphics
+

diff --git a/run/long-tests b/run/long-tests
deleted file mode 100755 (executable)
index 6c29254..0000000
--- a/run/long-tests
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/test/long-unit-tests
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" --leak-check=full build/test/long-unit-tests
-else
-    build/test/long-unit-tests
-fi