[dia: 65/105] #19: Windows: Use '; ' for separating paths in run_with_dia.



commit 4333ff182aa0a69ee8840cd29a6d4d599235d5f3
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sun Jan 6 21:05:40 2019 +0000

    #19: Windows: Use ';' for separating paths in run_with_dia.

 generate_run_with_dia_env.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/generate_run_with_dia_env.sh b/generate_run_with_dia_env.sh
index e7f05508..a240f645 100755
--- a/generate_run_with_dia_env.sh
+++ b/generate_run_with_dia_env.sh
@@ -6,18 +6,23 @@ fi
 SOURCE_ROOT=$2
 BUILD_ROOT=$3
 
+# Windows has ; for PATH separators.
+PATH_SEP=":"
+if uname | grep -iq MINGW; then
+    PATH_SEP=";"
+fi
 # This unfortunately is a duplication of run_env in
 # tests/meson.build.  This is fine as long as this
 # script is only used to generate run_with_dia_env
 # and only that.
 cat > $1 << EOF
 #!/usr/bin/env sh
-export DIA_BASE_PATH=${SOURCE_ROOT}
-export DIA_LIB_PATH=${BUILD_ROOT}/objects:${BUILD_ROOT}/plug-ins
-export DIA_SHAPE_PATH=${SOURCE_ROOT}/shapes
-export DIA_XSLT_PATH=${SOURCE_ROOT}/plug-ins/xslt
-export DIA_PYTHON_PATH=${SOURCE_ROOT}/plug-ins/python
-export DIA_SHEET_PATH=${BUILD_ROOT}/sheets
+export DIA_BASE_PATH="${SOURCE_ROOT}"
+export DIA_LIB_PATH="${BUILD_ROOT}/objects${PATH_SEP}${BUILD_ROOT}/plug-ins"
+export DIA_SHAPE_PATH="${SOURCE_ROOT}/shapes"
+export DIA_XSLT_PATH="${SOURCE_ROOT}/plug-ins/xslt"
+export DIA_PYTHON_PATH="${SOURCE_ROOT}/plug-ins/python"
+export DIA_SHEET_PATH="${BUILD_ROOT}/sheets"
 \$@
 EOF
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]