Move environment setup to run tests in wine to new file

diff --git a/tools/windows_packaging/run-wine.sh b/tools/windows_packaging/run-wine.sh
index 86415206cc371eb81d3b1fb608667755f166140e..d1d509782f35312dc03255a0cc31a934a6c3c255 100755 (executable)
--- a/tools/windows_packaging/run-wine.sh
+++ b/tools/windows_packaging/run-wine.sh
@@ -2,26 +2,7 @@
 
 . ./mingw-env.sh
 
-cd $BASE
-
-LIBS=$BUILD_DIR/libs
-
-export ARDOUR_PATH=$BASE/gtk2_ardour/icons:$BASE/gtk2_ardour/pixmaps:$BASE/build/default/gtk2_ardour:$BASE/gtk2_ardour:.
-export ARDOUR_SURFACES_PATH=$LIBS/surfaces/osc:$LIBS/surfaces/generic_midi:$LIBS/surfaces/tranzport:$LIBS/surfaces/powermate:$LIBS/surfaces/mackie
-export ARDOUR_PANNER_PATH=$LIBS/panners/2in2out:$LIBS/panners/1in2out:$LIBS/panners/vbap
-export ARDOUR_DATA_PATH=$BASE/gtk2_ardour:build/default/gtk2_ardour:.
-
-export VAMP_PATH=$LIBS/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
-
-export PBD_TEST_PATH=$BASE/libs/pbd/test/
-
-if test ! -d $PACKAGE_DIR; then
-       echo "Win32 package directory does not exist"
-       exit 1
-fi
-
-cd $PACKAGE_DIR 
-
+. ./wine-env.sh
 
 if [ "$1" == "--run-tests" ]; then
        if test x$WITH_TESTS != x ; then

diff --git a/tools/windows_packaging/wine-env.sh b/tools/windows_packaging/wine-env.sh
new file mode 100755 (executable)
index 0000000..95d0bf7
--- /dev/null
+++ b/tools/windows_packaging/wine-env.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+. ./mingw-env.sh
+
+cd $BASE
+
+if test ! -d $PACKAGE_DIR; then
+       echo "Win32 package directory does not exist"
+       exit 1
+fi
+
+LIBS=$BUILD_DIR/libs
+
+export ARDOUR_PATH=$BASE/gtk2_ardour/icons:$BASE/gtk2_ardour/pixmaps:$BASE/build/default/gtk2_ardour:$BASE/gtk2_ardour:.
+export ARDOUR_SURFACES_PATH=$LIBS/surfaces/osc:$LIBS/surfaces/generic_midi:$LIBS/surfaces/tranzport:$LIBS/surfaces/powermate:$LIBS/surfaces/mackie
+export ARDOUR_PANNER_PATH=$LIBS/panners/2in2out:$LIBS/panners/1in2out:$LIBS/panners/vbap
+export ARDOUR_DATA_PATH=$BASE/gtk2_ardour:build/default/gtk2_ardour:.
+
+export VAMP_PATH=$LIBS/vamp-plugins${VAMP_PATH:+:$VAMP_PATH}
+
+export PBD_TEST_PATH=$BASE/libs/pbd/test/
+
+cd $PACKAGE_DIR