Some fix in kernel configuration

Benjamin Renard
1 parent 16582b4a
Showing 13 changed files with 55 additions and 73 deletions Show diff stats
.gitignore
CMakeLists.txt
README.md
config/app/log4cxx.config.light
config/app/templates/app.properties.debug.in
config/app/templates/app.properties.generate-paraminfo.in
config/app/templates/app.properties.release.in
script/templates/deploy-debug.sh.in -> script/deploy-debug.sh
script/templates/deploy-release.sh.in -> script/deploy-release.sh
script/deploy.sh
script/generate_sonar_report.sh
script/start-fitnesse.sh
script/templates/amda-kernel-env.in
@@ -5,8 +5,6 @@ src/Common/AMDA-Kernel_Config.hh
 app-*/*
 !app-*/lib
 !app-*/src
-script/deploy-debug.sh
-script/deploy-release.sh
 script/amda-kernel-env
 config/app/spiceKernelConfig.xml
 test/FitNesseRoot/ErrorLogs/
@@ -5,7 +5,6 @@ PROJECT(AMDA-Kernel)
 SET(CPACK_PACKAGE_VERSION_MAJOR "3")
 SET(CPACK_PACKAGE_VERSION_MINOR "6")
 SET(CPACK_PACKAGE_VERSION_PATCH "0")
-SET(SPICE_KERNELS_DATA "/usr/local/data/ORBITS/Kernels")
  
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/)
@@ -22,21 +21,19 @@ set(Boost_USE_MULTITHREADED ON)
 # Check some environment variables
 if (EXISTS "$ENV{AMDA_COTS_DIR}")
     message("AMDA_COTS_DIR exists")
-    set(USERLOCAL_ROOT "$ENV{AMDA_COTS_DIR}")
+    set(AMDA_COTS_DIR "$ENV{AMDA_COTS_DIR}")
+    set(USERLOCAL_ROOT "$ENV{AMDA_COTS_DIR}/local")
+    set(AMDA_TOOLS_DIR "$ENV{AMDA_COTS_DIR}/tools")
+    set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf")
+    set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost")
+    set(SONAR_ROOT "$ENV{AMDA_COTS_DIR}/tools/sonar")
+    set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/fitnesse")
 else()
     message(FATAL_ERROR "AMDA_COTS_DIR NOT exists")
 endif()
  
 message("USERLOCAL_ROOT (AMDA COTS install directory) is defined as ${USERLOCAL_ROOT}")
-
-if (EXISTS "$ENV{AMDA_GCC_DIR}")
-    message("AMDA_GCC_DIR exists")
-    set(GCC_INSTALL_DIR "$ENV{AMDA_GCC_DIR}")
-    set(BOOST_ROOT "$ENV{AMDA_GCC_DIR}/gcc/4.7.2/boost")
-else()
-    message(FATAL_ERROR "AMDA_GCC_DIR NOT exists")
-endif()
-
+message("GCC_ROOT (gcc install directory) is defined as ${GCC_ROOT}")
 message("BOOST_ROOT (Boost install directory) is defined as ${BOOST_ROOT}")
  
 if(NOT DEFINED ENV{DDSERVER_HOST_NAME})
@@ -93,13 +90,11 @@ foreach(environment debug release generate-paraminfo)
     )
 endforeach()
  
-foreach(templated_file amda-kernel-env deploy-debug.sh deploy-release.sh)
-    configure_file (
-        "${CMAKE_SOURCE_DIR}/script/templates/${templated_file}.in"
-        "${CMAKE_SOURCE_DIR}/script/${templated_file}"
-        @ONLY
-    )
-endforeach()
+configure_file (
+    "${CMAKE_SOURCE_DIR}/script/templates/amda-kernel-env.in"
+    "${CMAKE_SOURCE_DIR}/script/amda-kernel-env"
+    @ONLY
+)
  
 # Build AMDA Kernel
 MESSAGE( STATUS "Build AMDA-Kernel Project" )
@@ -5,8 +5,7 @@
 **The first compilation** must be done with the script `script/deploy.sh` and with these required arguments:
  
 - `-b`: build type (Debug or Release)
-- `-g` : gcc install directory
-- `-o` : AMDA COTS install directory
+- `-c` : COTS install directory (typically '/opt')
 - `-d` : DDServer host name (will be write in DD.res file)
 - `-p` : DDServer port (will be write in DD.res file)
  
@@ -14,7 +13,9 @@ For exemple:
  
 	script/deploy.sh -b "Debug" -g "/opt/tools" -o "/opt/local" -d "amdadev.fr" -p "5000"
  
-During this first compilation, scripts `script/deploy-debug.sh` and `script/deploy-release.sh` will be generated and they can be used later to compile the application with the same arguments.
+During this first compilation, the correponding environment file will be write in 'script/amda-kernel-env'.
+
+Once this first step done, next compilation can be done with scripts `script/deploy-debug.sh` and `script/deploy-release.sh` (no arguments required, the generated environment file will be used).
  
 For example, to compile the application in release mode, you have just to run this command line:
  
@@ -1,14 +0,0 @@
-log4j.rootLogger=error, stdout, F
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-
-# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=%X{PID} %r %5p [%t]  (%r ms)  (%F:%L) - %m%n
-
-log4j.appender.F=org.apache.log4j.FileAppender
-log4j.appender.F.File=example.log
-log4j.appender.F.Append=false
-
-log4j.appender.F.layout=org.apache.log4j.PatternLayout
-log4j.appender.F.layout.ConversionPattern=%p %t (%r ms)  %c - %m%n
@@ -24,7 +24,7 @@ app.process.src=src
 app.process.lib=lib
 app.process.CXX_COMPILER=g++
 app.process.CMAKE_CXX_FLAGS=-g -std=c++0x -fPIC -Wall -ggdb -DLINUX -Dlinux -D_REENTRANT -malign-double -pthread
-app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_INSTALL_DIR@/gcc/4.7.2/boost/include -I@USERLOCAL_ROOT@/include/log4cxx 
+app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_ROOT@/include -I@BOOST_ROOT@/include -I@USERLOCAL_ROOT@/include/log4cxx 
 app.process.LIB=-L../build/Debug/lib/ -lParameters
 # Plot default configuration
 app.plot.configfile=../config/app/plotConfig.xml
@@ -24,7 +24,7 @@ app.process.src=src
 app.process.lib=lib
 app.process.CXX_COMPILER=g++
 app.process.CMAKE_CXX_FLAGS=-g -std=c++0x -fPIC -Wall -ggdb -DLINUX -Dlinux -D_REENTRANT -malign-double -pthread
-app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_INSTALL_DIR@/gcc/4.7.2/boost/include -I@USERLOCAL_ROOT@/include/log4cxx
+app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_ROOT@/include -I@BOOST_ROOT@/include -I@USERLOCAL_ROOT@/include/log4cxx
 app.process.LIB=-L../build/Debug/lib/ -lParameters
 # Plot default configuration
 app.plot.configfile=../config/app/plotConfig.xml
@@ -24,7 +24,7 @@ app.process.src=src
 app.process.lib=lib
 app.process.CXX_COMPILER=g++
 app.process.CMAKE_CXX_FLAGS=-std=c++0x -Wall -fPIC -DLINUX -Dlinux -D_REENTRANT -malign-double -pthread -O3 -DNDEBUG
-app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_INSTALL_DIR@/gcc/4.7.2/boost/include -I@USERLOCAL_ROOT@/include/log4cxx 
+app.process.INCLUDE=-I../src/InternLib -I../src/Common -I../src/Parameters -I../src/DD_Client_Lib -I../src/helpers -I../src/TimeTableCatalog -I@USERLOCAL_ROOT@/include -I@GCC_ROOT@/include -I@BOOST_ROOT@/include -I@USERLOCAL_ROOT@/include/log4cxx
 app.process.LIB=-L../build/Release/lib/ -lParameters
 # Plot default configuration
 app.plot.configfile=../config/app/plotConfig.xml
@@ -3,4 +3,6 @@
 SCRIPT=$(readlink -f "$0")
 SCRIPTDIR=$(dirname "$SCRIPT")
  
-$SCRIPTDIR/deploy.sh -b Debug -g "@GCC_INSTALL_DIR@" -o "@USERLOCAL_ROOT@" -d "@DDSERVER_HOST_NAME@" -p "@DDSERVER_PORT@"
+. ${SCRIPTDIR}/amda-kernel-env
+
+$SCRIPTDIR/deploy.sh -b Debug -c "${AMDA_COTS_DIR}" -d "${DDSERVER_HOST_NAME}" -p ${DDSERVER_PORT}
@@ -3,4 +3,6 @@
 SCRIPT=$(readlink -f "$0")
 SCRIPTDIR=$(dirname "$SCRIPT")
  
-$SCRIPTDIR/deploy.sh -b Release -g "@GCC_INSTALL_DIR@" -o "@USERLOCAL_ROOT@" -d "@DDSERVER_HOST_NAME@" -p "@DDSERVER_PORT@"
+. ${SCRIPTDIR}/amda-kernel-env
+
+$SCRIPTDIR/deploy.sh -b Release -c "${AMDA_COTS_DIR}" -d "${DDSERVER_HOST_NAME}" -p ${DDSERVER_PORT}
@@ -6,18 +6,17 @@ SCRIPTDIR=$(dirname &quot;$SCRIPT&quot;)
 usage="
     \n ### Deploy AMDA Kernel ###
     \n
-    \n    Usage : $0 -b <build type (Debug or Release)> -g <gcc install directory> -o <other COTS install directory> -d <DDServer host name> -p <DDServer port>
+    \n    Usage : $0 -b <build type (Debug or Release)> -c <COTS install directory> -d <DDServer host name> -p <DDServer port>
     \n
-    \n            $0 -b Debug -g /opt/tools -o /opt/local -d amdadev.fr -p 5000
+    \n            $0 -b Debug -c /opt -d amdadev.fr -p 5000
     \n
     \n
     \n ###"
  
-while getopts "b:g:o:d:p:h" options; do
+while getopts "b:c:d:p:h" options; do
     case $options in
         b ) KERNEL_BUILD_TYPE=`echo $OPTARG`;;
-        g ) GCC_INSTALL_DIR=`echo $OPTARG`;;
-        o ) COTS_INSTALL_DIR=`echo $OPTARG`;;
+        c ) COTS_DIR=`echo $OPTARG`;;
         d ) DDSERVER_HOST_NAME=`echo $OPTARG`;;
         p ) DDSERVER_PORT=`echo $OPTARG`;;
         h ) echo -e $usage
@@ -29,25 +28,21 @@ while getopts &quot;b:g:o:d:p:h&quot; options; do
     esac
 done
  
-if [ "$GCC_INSTALL_DIR" = "" ]
+if [ "$COTS_DIR" = "" ]
 then
     echo -e $usage
     exit 1
 fi
  
-if [ ! -d "$GCC_INSTALL_DIR" ]; then
+if [ ! -d "$COTS_DIR/tools/gcc" ]; then
     echo -e $usage
+    echo "[ERROR] Cannot find GCC tool directory $COTS_DIR/tools/gcc"
     exit 1
 fi
  
-if [ "$COTS_INSTALL_DIR" = "" ]
-then
-    echo -e $usage
-    exit 1
-fi
-
-if [ ! -d "$COTS_INSTALL_DIR" ]; then
+if [ ! -d "$COTS_DIR/local/lib" ]; then
     echo -e $usage
+    echo "[ERROR] Cannot find lib directory $COTS_DIR/local/lib"
     exit 1
 fi
  
@@ -65,26 +60,23 @@ fi
  
 if [ "$KERNEL_BUILD_TYPE" = "Debug" ]
 then
-    echo ""
-    echo "[INFO] Install AMDA Kernel in $SRC_DIR (Debug mode)"
+    echo "[INFO] Install AMDA Kernel in Debug mode"
 elif [ "$KERNEL_BUILD_TYPE" = "Release" ]
 then
-    echo ""
-    echo "[INFO] Install AMDA Kernel in $SRC_DIR (Release mode)"
+    echo "[INFO] Install AMDA Kernel in Release mode"
 else
     echo -e $usage
     exit 1
 fi
  
-export AMDA_COTS_DIR="$COTS_INSTALL_DIR"
-export AMDA_GCC_DIR="$GCC_INSTALL_DIR"
+export AMDA_COTS_DIR="$COTS_DIR"
 export DDSERVER_HOST_NAME="$DDSERVER_HOST_NAME"
 export DDSERVER_PORT="$DDSERVER_PORT"
-export LD_LIBRARY_PATH="$GCC_INSTALL_DIR/gcc/4.7.2/rtf/lib64:$GCC_INSTALL_DIR/gcc/4.7.2/rtf/lib:$COTS_INSTALL_DIR/lib:$LD_LIBRARY_PATH"
-export PATH="$GCC_INSTALL_DIR/gcc/4.7.2/rtf/bin:$COTS_INSTALL_DIR/bin:$PATH"
+export LD_LIBRARY_PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/lib64:$COTS_DIR/tools/gcc/4.7.2/rtf/lib:$COTS_DIR/local/lib:$LD_LIBRARY_PATH"
+export PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/bin:$COTS_DIR/local/bin:$PATH"
  
 cmake -E make_directory "$SCRIPTDIR/../build"
 cmake -E make_directory "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE"
-cmake -E chdir "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" cmake -DCMAKE_C_COMPILER="$AMDA_GCC_DIR/gcc/4.7.2/rtf/bin/gcc" -DCMAKE_CXX_COMPILER="$AMDA_GCC_DIR/gcc/4.7.2/rtf/bin/g++" -DCMAKE_BUILD_TYPE=$KERNEL_BUILD_TYPE ../..
+cmake -E chdir "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" cmake -DCMAKE_C_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/gcc" -DCMAKE_CXX_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/g++" -DCMAKE_BUILD_TYPE=$KERNEL_BUILD_TYPE ../..
 cmake --build "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE"
 make -C "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" install VERBOSE=1
@@ -10,4 +10,4 @@ ${SCRIPTDIR}/generate_cppcheck_report.sh
  
 cd ${PROJECTDIR}
  
-${SONAR_DIR}/sonar-runner-1.4/bin/sonar-runner
+${SONAR_ROOT}/sonar-runner-1.4/bin/sonar-runner
@@ -12,7 +12,7 @@ fi;
  
 . ${SCRIPTDIR}/amda-kernel-env
  
-export PATH="${SCRIPT_PATH}/../build/Debug/bin:$PATH"
-nohup java -jar "${FITNESSE_DIR}/fitnesse-standalone.jar" -d test -e 0 -p ${FITNESSE_PORT} &
+export PATH="${SCRIPTDIR}/../build/Debug/bin:$PATH"
+nohup java -jar "${FITNESSE_ROOT}/fitnesse-standalone.jar" -d test -e 0 -p ${FITNESSE_PORT} &
  
 exit 0
-MY_GXX_HOME="@GCC_INSTALL_DIR@/gcc/4.7.2/rtf"
-export PATH="${MY_GXX_HOME}/bin:@USERLOCAL_ROOT@/bin:${PATH}"
-export LD_LIBRARY_PATH="${MY_GXX_HOME}/lib64:${MY_GXX_HOME}/lib:@USERLOCAL_ROOT@/lib:${LD_LIBRARY_PATH}"
-export SONAR_DIR="@USERLOCAL_ROOT@/sonar"
-export FITNESSE_DIR="@USERLOCAL_ROOT@/FitNesse"
+export AMDA_COTS_DIR="@AMDA_COTS_DIR@"
+export USERLOCAL_ROOT="@USERLOCAL_ROOT@"
+export GCC_ROOT="@GCC_ROOT@"
+export BOOST_ROOT="@BOOST_ROOT@"
+export DDSERVER_HOST_NAME="@DDSERVER_HOST_NAME@"
+export DDSERVER_PORT=@DDSERVER_PORT@
+export SONAR_ROOT="@SONAR_ROOT@"
+export FITNESSE_ROOT="@FITNESSE_ROOT@"
+export SPICE_KERNELS_DATA="/usr/local/data/ORBITS/Kernels"
+export PATH="@GCC_ROOT@/bin:@USERLOCAL_ROOT@/bin:${PATH}"
+export LD_LIBRARY_PATH="@GCC_ROOT@/lib64:@GCC_ROOT@/lib:@USERLOCAL_ROOT@/lib:${LD_LIBRARY_PATH}"