From 2f6f53d2c1d9af63f68cb32ddbda21390439a236 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Mon, 16 Sep 2013 14:01:18 +0000
Subject: [PATCH] Modified tutorial script.

---
 doc/build.sh | 62 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 23 deletions(-)

diff --git a/doc/build.sh b/doc/build.sh
index 1b246b676..f36e48c52 100644
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -3,36 +3,52 @@ ARCH_OS=$1;
 GCC_VSN=$2;
 export LCG_external_area=/afs/cern.ch/sw/lcg/external;
 if test -z "$GCC_VSN";
-    then
-    GCC_VSN=gcc46;
+then
+    export GCC_VSN=gcc46;
     echo "Using default gcc version:${GCC_VSN}";
-    fi;
+fi;
 if test -z "${ARCH_OS}";
+then
+    export ARCH_OS=slc6;
+    echo "Using default architecture version:${ARCH_OS}";
+fi;
+
+if test -n "${ARCH_OS}";
+then 
+    if test -n "${GCC_VSN}";
     then
-    echo "You must supply the architecture as first argument:";
-    echo "$0 [os-version:slc5,slc6]  [gcc-version:gcc43,gcc46]";
-else  
-    svn co https://svnsrv.desy.de/basic/aidasoft/DD4hep/trunk DD4hep
-    mkdir ${ARCH_OS};
-    cd    ${ARCH_OS};
-    export ARCH=x86_64-${ARCH_OS};
-    if test $GCC_VSN = "gcc46";
+	svn co https://svnsrv.desy.de/basic/aidasoft/DD4hep/trunk DD4hep
+        export BUILD_DIR=${ARCH_OS}-${GCC_VSN};
+	mkdir ${BUILD_DIR};
+	cd    ${BUILD_DIR};
+	export ARCH=x86_64-${ARCH_OS};
+	if test $GCC_VSN = "gcc46";
 	then 
-	. ${LCG_external_area}/gcc/4.6/${ARCH}/setup.sh /afs/cern.ch/sw/lcg/external;
+	    . ${LCG_external_area}/gcc/4.6/${ARCH}/setup.sh /afs/cern.ch/sw/lcg/external;
 	fi;
-    if test $GCC_VSN = "gcc43";
+	if test $GCC_VSN = "gcc43";
 	then
-	. ${LCG_external_area}/gcc/4.3/${ARCH}/setup.sh /afs/cern.ch/sw/lcg/external;
+	    . ${LCG_external_area}/gcc/4.3/${ARCH}/setup.sh /afs/cern.ch/sw/lcg/external;
 	fi;
-    export ROOTSYS=/afs/cern.ch/sw/lcg/app/releases/ROOT/5.34.04/${ARCH}-${GCC_VSN}-dbg/root;
-    export PATH=${LCG_external_area}/CMake/2.8.6/${ARCH}-${GCC_VSN}-opt/bin:${ROOTSYS}/bin:$PATH;
+	export ROOTSYS=/afs/cern.ch/sw/lcg/app/releases/ROOT/5.34.04/${ARCH}-${GCC_VSN}-dbg/root;
+	export PATH=${LCG_external_area}/CMake/2.8.6/${ARCH}-${GCC_VSN}-opt/bin:${ROOTSYS}/bin:$PATH;
 
-    ls -laF ${ROOTSYS}/bin
-    echo "CMAKE: `which cmake`   --  ${LCG_external_area}/CMake/2.8.6/${ARCH}-${GCC_VSN}-opt/bin";
-    echo "PATH=${PATH}";
+	ls -laF ${ROOTSYS}/bin
+	echo "CMAKE: `which cmake`   --  ${LCG_external_area}/CMake/2.8.6/${ARCH}-${GCC_VSN}-opt/bin";
+	echo "PATH=${PATH}";
 
-    cmake -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_WITH_GEANT4=OFF -DDD4HEP_USE_PYROOT=OFF ../DD4hep;
-    make -j 5;
-    . thisdd4hep.sh;
-    ./bin/geoDisplay file:../DD4hep/DDExamples/ILDExDet/compact/CLIC_ILD_CDR.xml    
+	cmake -DCMAKE_BUILD_TYPE=Debug -DDD4HEP_WITH_GEANT4=OFF -DDD4HEP_USE_PYROOT=OFF ../DD4hep;
+	make;
+	. thisdd4hep.sh;
+	./bin/geoDisplay file:../DD4hep/examples/CLICSiD/compact/compact_polycones.xml    
+	echo "";
+	echo "Did the simple test detector show up properly?";
+	echo "";
+    else
+	echo "You must supply the architecture as first argument:";
+	echo "$0 [os-version:slc5,slc6]  [gcc-version:gcc43,gcc46]";
+    fi;
+else
+    echo "You must supply the architecture as first argument:";
+    echo "$0 [os-version:slc5,slc6]  [gcc-version:gcc43,gcc46]";
 fi;
-- 
GitLab