0024214: wgenproj command started on Linux platform with -target=amk option generate...

env.sh processes amk case

diff --git a/src/WOKTclLib/templates/codeblocks.sh b/src/WOKTclLib/templates/codeblocks.sh
index 8e87c86f5ddd244cf9a9d7d1f32ab6c9a6badb66..12eb8d2760a81187e3a237de0b8d9925492401ae 100755 (executable)
--- a/src/WOKTclLib/templates/codeblocks.sh
+++ b/src/WOKTclLib/templates/codeblocks.sh
@@ -2,7 +2,7 @@
 
 export TARGET="cbp"
 
-source ./env.sh "$TARGET" "$1"
+source ./env.sh "$1" "$TARGET"
 
 if [ -e "/Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks" ]; then
   /Applications/CodeBlocks.app/Contents/MacOS/CodeBlocks ./adm/$WOKSTATION/cbp/OCCT.workspace

diff --git a/src/WOKTclLib/templates/env.sh b/src/WOKTclLib/templates/env.sh
index 96525ed3fdd336cc4fd21bdf1dc4a0526b4040d4..ec74e68a759dca9b5f5f97139d742092f43f6421 100755 (executable)
--- a/src/WOKTclLib/templates/env.sh
+++ b/src/WOKTclLib/templates/env.sh
@@ -29,16 +29,14 @@ if [ -e "${aScriptPath}/custom.sh" ]; then source "${aScriptPath}/custom.sh"; fi
 
 # Read script arguments
 shopt -s nocasematch
-if [[ "$1" == "cbp" ]]; then
+export TARGET="";
+if [[ "$2" == "cbp" ]]; then
   export TARGET="cbp";
-elif [[ "$1" == "xcd" ]]; then
+elif [[ "$2" == "xcd" ]]; then
   export TARGET="xcd";
-else
-  echo "Error: wrong target identifier. Should be \"cbp\" (Code::Blocks) or \"xcd\" (Xcode)"
-  exit
 fi
-if [[ "$2" == "debug" ]]; then export CASDEB="d"; fi
-if [[ "$2" == "d" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "debug" ]]; then export CASDEB="d"; fi
+if [[ "$1" == "d" ]]; then export CASDEB="d"; fi
 shopt -u nocasematch
 
 # ----- Setup Environment Variables -----
@@ -141,12 +139,9 @@ else
 fi
 
 
-BIN_PATH=""
-LIBS_PATH=""
-if [ "${TARGET}" == "cbp" ]; then
-  BIN_PATH="${CASBIN}/bin${CASDEB}"
-  LIBS_PATH="${CASBIN}/lib${CASDEB}"
-elif [ "${TARGET}" == "xcd" ]; then
+BIN_PATH="${CASBIN}bin${CASDEB}"
+LIBS_PATH="${CASBIN}lib${CASDEB}"
+if [ "${TARGET}" == "xcd" ]; then
   [[ "${CASDEB}" == "d" ]] && BIN_PATH="${CASBIN}/Debug" || BIN_PATH="${CASBIN}/Release"
   LIBS_PATH="$BIN_PATH"
 fi

diff --git a/src/WOKTclLib/templates/xcode.sh b/src/WOKTclLib/templates/xcode.sh
index 4bf107987add8951eb43eff8a9b4cb5334a2a81f..ddc0620742691088fa4b0d4fa8a376684d6d5de9 100755 (executable)
--- a/src/WOKTclLib/templates/xcode.sh
+++ b/src/WOKTclLib/templates/xcode.sh
@@ -2,6 +2,6 @@
 
 export TARGET="xcd"
 
-source ./env.sh "$TARGET" "$1"
+source ./env.sh "$1" "$TARGET"
 
 open -a Xcode ./adm/mac/xcd/OCCT.xcworkspace