Commit fd611b4f authored by Alexander David Hellwig's avatar Alexander David Hellwig
Browse files

Fix linux build: fix sh files

parent a5860ca3
......@@ -20,9 +20,9 @@
# *******************************************************************************
#
# exit with code on error
set -e
cd native
sh variables.sh
sh compileTestsArmadilloBackendOpenBLAS.sh %PROJECT_ROOT%%1 %PROJECT_ROOT%%2
exit
\ No newline at end of file
source variables.sh
source compileTestsArmadilloBackendOpenBLAS.sh "${PROJECT_ROOT}/$1" "${PROJECT_ROOT}/$2"
\ No newline at end of file
......@@ -20,8 +20,10 @@
# *******************************************************************************
#
# exit with code on error
set -e
cd native
sh variables.sh
cd %PROJECT_ROOT%%1
sh TestsForCurrentModel.exe
\ No newline at end of file
source variables.sh
cd "${PROJECT_ROOT}/${1}"
./TestsForCurrentModel
\ No newline at end of file
......@@ -20,19 +20,21 @@
# *******************************************************************************
#
# exit with code on error
set -e
sh variables.sh
set STREAM_TESTING=%PROJECT_ROOT%/target/generated-sources-cpp/streamtest
set AUTOPILOT_TESTS=%STREAM_TESTING%/target/generated-sources-cpp/streamtest/autopilot
set STREAM_TEST_EXEC_DIR=%STREAM_TESTING%/exec
source variables.sh
export STREAM_TESTING="${PROJECT_ROOT}/target/generated-sources-cpp/streamtest"
export AUTOPILOT_TESTS="${STREAM_TESTING}/target/generated-sources-cpp/streamtest/autopilot"
export STREAM_TEST_EXEC_DIR="${STREAM_TESTING}/exec"
g++ -std=c++11 ^
-I"%JAVA_HOME%/include_linux" ^
-I"%JAVA_HOME%/include_linux/linux" ^
-I"%ARMADILLO_HOME%/include" ^
-L"%HOME%/lib/linux" ^
-o "%2/TestsForCurrentModel.exe" ^
"%ARMADILLO_HOME%/include/catch_tests_main.o" ^
"%1/test/tests_main.cpp" ^
-include %ARMADILLO_HOME%/include/armadillo.h ^
-DARMA_DONT_USE_WRAPPER -lgdi32 -lopenblas -llibarpack-2
g++ -std=c++11 \
-I"${JAVA_HOME}/include_linux" \
-I"${JAVA_HOME}/include_linux/linux" \
-I"${ARMADILLO_HOME}/include" \
-L"${HOME}/lib/linux" \
-o "${2}/TestsForCurrentModel" \
"${ARMADILLO_HOME}/include/catch_tests_main.cpp.ghc" \
"${1}/test/tests_main.cpp" \
-include "${ARMADILLO_HOME}/include/armadillo.h" \
-DARMA_DONT_USE_WRAPPER -lopenblas
\ No newline at end of file
......@@ -21,36 +21,36 @@
#
pushd %~dp0
pushd `pwd` > /dev/null
cd ..
set PROJECT_ROOT=%CD%
set HOME=%PROJECT_ROOT%/native
popd
set SIMULATION_URL=http://localhost:8080/
set JAVA_HOME=%HOME%/jdk
set TOMCAT_HOME=%HOME%/apache-tomcat-9.0.5
set MINGW_HOME=%HOME%/mingw64
set OCTAVE_HOME=%HOME%/octave-4.2.1
set ARMADILLO_HOME=%HOME%/armadillo
set CPP_DIR=%HOME%/cpp
set DLL_DIR=%HOME%/dll
set LIB_DIR=%HOME%/lib
set EXTERNAL_LIBS=%HOME%/externallibs
set PATH=%EXTERNAL_LIBS%;%LIB_DIR%;%MINGW_HOME%/bin;%DLL_DIR%;%JAVA_HOME%/bin;%OCTAVE_HOME%/bin;%PATH%
set SVG_HOME=%HOME%/visualisation
set REPORTING_HOME=%HOME%/reporting
set CHROME=%HOME%/chrome/GoogleChromePortable.exe
set TEST_EXEC_DIR=%HOME%/exec
REM set CLUSTERER_CPP_DIR=%HOME%/clusterer-cpp
set CLUSTERER_EXEC_DIR=%HOME%/exec
set VERIFICATION_HOME=%HOME%/viewverification
set NFPVERIFICATION_HOME=%HOME%/nfpverification
set DISTR_SIM=%HOME%/distributed-simulator
set PSQL=%DISTR_SIM%/PostgreSQLPortable
set SFS=%DISTR_SIM%/SmartFoxServer_2X/SFS2X
set RMI=%DISTR_SIM%/RMIModelServer
set RMI_PATH=%EXTERNAL_LIBS%;%LIB_DIR%;%MINGW_HOME%/bin;%DLL_DIR%;%JAVA_HOME%/bin;%OCTAVE_HOME%/bin;
set WASM_HOME=%HOME%/emam2wasm
set PACMAN_HOME=%HOME%/pacman
set SUPERMARIO_HOME=%HOME%/supermario
set CNCVERIFICATION_HOME=%HOME%/cncverification
export PROJECT_ROOT="`pwd`"
export HOME="${PROJECT_ROOT}/native"
popd > /dev/null
export SIMULATION_URL="http://localhost:8080/"
export JAVA_HOME="${HOME}/jdk"
export TOMCAT_HOME="${HOME}/apache-tomcat-9.0.5"
export MINGW_HOME="${HOME}/mingw64"
export OCTAVE_HOME="${HOME}/octave-4.2.1"
export ARMADILLO_HOME="${HOME}/armadillo_linux"
export CPP_DIR="${HOME}/cpp"
export DLL_DIR="${HOME}/dll"
export LIB_DIR="${HOME}/lib"
export EXTERNAL_LIBS="${HOME}/externallibs"
export PATH="${EXTERNAL_LIBS}:${LIB_DIR}:${MINGW_HOME}/bin:${DLL_DIR}:${JAVA_HOME}/bin:${OCTAVE_HOME}/bin:${PATH}"
export SVG_HOME="${HOME}/visualisation"
export REPORTING_HOME="${HOME}/reporting"
export CHROME="${HOME}/chrome/GoogleChromePortable.exe"
export TEST_EXEC_DIR="${HOME}/exec"
# export CLUSTERER_CPP_DIR="${HOME}/clusterer-cpp"
export CLUSTERER_EXEC_DIR="${HOME}/exec"
export VERIFICATION_HOME="${HOME}/viewverification"
export NFPVERIFICATION_HOME="${HOME}/nfpverification"
export DISTR_SIM="${HOME}/distributed-simulator"
export PSQL="${DISTR_SIM}/PostgreSQLPortable"
export SFS="${DISTR_SIM}/SmartFoxServer_2X/SFS2X"
export RMI="${DISTR_SIM}/RMIModelServer"
export RMI_PATH="${EXTERNAL_LIBS}:${LIB_DIR}:${MINGW_HOME}/bin:${DLL_DIR}:${JAVA_HOME}/bin:${OCTAVE_HOME}/bin:"
export WASM_HOME="${HOME}/emam2wasm"
export PACMAN_HOME="${HOME}/pacman"
export SUPERMARIO_HOME="${HOME}/supermario"
export CNCVERIFICATION_HOME="${HOME}/cncverification"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment