Skip to content

GitLab

E
EMAM2Cpp
Commit 37ccadf4 authored by Sascha Niklas Schneiders's avatar Sascha Niklas Schneiders
Browse files
Options

cleaned up multiplatform directory files and continued work on linux support

parent 35fa2eee
Pipeline #67894 failed with stage
    in 2 minutes and 10 seconds
    Expand all Hide whitespace changes
    Inline Side-by-side
    Showing with 10203 additions and 390 deletions
    .circleci/config.yml
    View file @ 37ccadf4
    #
    #
    # ******************************************************************************
    # MontiCAR Modeling Family, www.se-rwth.de
    # Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    # All rights reserved.
    #
    # This project is free software; you can redistribute it and/or
    # modify it under the terms of the GNU Lesser General Public
    # License as published by the Free Software Foundation; either
    # version 3.0 of the License, or (at your option) any later version.
    # This library is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    # Lesser General Public License for more details.
    #
    # You should have received a copy of the GNU Lesser General Public
    # License along with this project. If not, see <http://www.gnu.org/licenses/>.
    # *******************************************************************************
    #
    # Java Maven CircleCI 2.0 configuration file
    #
    # Check https://circleci.com/docs/2.0/language-java/ for more details
    ......
    .gitlab-ci.yml
    View file @ 37ccadf4
    #
    #
    # ******************************************************************************
    # MontiCAR Modeling Family, www.se-rwth.de
    # Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    # All rights reserved.
    #
    # This project is free software; you can redistribute it and/or
    # modify it under the terms of the GNU Lesser General Public
    # License as published by the Free Software Foundation; either
    # version 3.0 of the License, or (at your option) any later version.
    # This library is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    # Lesser General Public License for more details.
    #
    # You should have received a copy of the GNU Lesser General Public
    # License along with this project. If not, see <http://www.gnu.org/licenses/>.
    # *******************************************************************************
    #
    stages:
    #- windows
    - linux
    ......
    compileCPPTests.bat
    View file @ 37ccadf4
    @REM
    @REM
    @REM ******************************************************************************
    @REM MontiCAR Modeling Family, www.se-rwth.de
    @REM Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    @REM All rights reserved.
    @REM
    @REM This project is free software; you can redistribute it and/or
    @REM modify it under the terms of the GNU Lesser General Public
    @REM License as published by the Free Software Foundation; either
    @REM version 3.0 of the License, or (at your option) any later version.
    @REM This library is distributed in the hope that it will be useful,
    @REM but WITHOUT ANY WARRANTY; without even the implied warranty of
    @REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    @REM Lesser General Public License for more details.
    @REM
    @REM You should have received a copy of the GNU Lesser General Public
    @REM License along with this project. If not, see <http://www.gnu.org/licenses/>.
    @REM *******************************************************************************
    @REM
    cd native
    call variables.bat
    call compileTestsArmadilloBackendOpenBLAS.bat %PROJECT_ROOT%%1 %PROJECT_ROOT%%2
    ......
    compileCPPTests.sh 0 → 100644
    View file @ 37ccadf4
    #!/bin/bash
    #
    #
    # ******************************************************************************
    # MontiCAR Modeling Family, www.se-rwth.de
    # Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    # All rights reserved.
    #
    # This project is free software; you can redistribute it and/or
    # modify it under the terms of the GNU Lesser General Public
    # License as published by the Free Software Foundation; either
    # version 3.0 of the License, or (at your option) any later version.
    # This library is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    # Lesser General Public License for more details.
    #
    # You should have received a copy of the GNU Lesser General Public
    # License along with this project. If not, see <http://www.gnu.org/licenses/>.
    # *******************************************************************************
    #
    cd native
    sh variables.sh
    sh compileTestsArmadilloBackendOpenBLAS.sh %PROJECT_ROOT%%1 %PROJECT_ROOT%%2
    exit
    \ No newline at end of file
    executeStreamTest.bat
    View file @ 37ccadf4
    @REM
    @REM
    @REM ******************************************************************************
    @REM MontiCAR Modeling Family, www.se-rwth.de
    @REM Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    @REM All rights reserved.
    @REM
    @REM This project is free software; you can redistribute it and/or
    @REM modify it under the terms of the GNU Lesser General Public
    @REM License as published by the Free Software Foundation; either
    @REM version 3.0 of the License, or (at your option) any later version.
    @REM This library is distributed in the hope that it will be useful,
    @REM but WITHOUT ANY WARRANTY; without even the implied warranty of
    @REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    @REM Lesser General Public License for more details.
    @REM
    @REM You should have received a copy of the GNU Lesser General Public
    @REM License along with this project. If not, see <http://www.gnu.org/licenses/>.
    @REM *******************************************************************************
    @REM
    cd native
    call variables.bat
    cd %PROJECT_ROOT%%1
    ......
    executeStreamTest.sh 0 → 100644
    View file @ 37ccadf4
    #!/bin/bash
    #
    #
    # ******************************************************************************
    # MontiCAR Modeling Family, www.se-rwth.de
    # Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    # All rights reserved.
    #
    # This project is free software; you can redistribute it and/or
    # modify it under the terms of the GNU Lesser General Public
    # License as published by the Free Software Foundation; either
    # version 3.0 of the License, or (at your option) any later version.
    # This library is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    # Lesser General Public License for more details.
    #
    # You should have received a copy of the GNU Lesser General Public
    # License along with this project. If not, see <http://www.gnu.org/licenses/>.
    # *******************************************************************************
    #
    cd native
    sh variables.sh
    cd %PROJECT_ROOT%%1
    sh TestsForCurrentModel.exe
    \ No newline at end of file
    native/armadillo/include/CImg.h
    View file @ 37ccadf4
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    /*
    #
    # File : CImg.h
    native/armadillo/include/armadillo.h
    View file @ 37ccadf4
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    #include "armadillo"
    #include <iosfwd>
    #include <string>
    ......
    native/armadillo/include/catch_tests_main.cpp
    View file @ 37ccadf4
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    #ifndef TESTS_MAIN
    #define TESTS_MAIN
    ......
    native/compileTestsArmadilloBackendOpenBLAS.bat
    View file @ 37ccadf4
    @REM
    @REM
    @REM ******************************************************************************
    @REM MontiCAR Modeling Family, www.se-rwth.de
    @REM Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    @REM All rights reserved.
    @REM
    @REM This project is free software; you can redistribute it and/or
    @REM modify it under the terms of the GNU Lesser General Public
    @REM License as published by the Free Software Foundation; either
    @REM version 3.0 of the License, or (at your option) any later version.
    @REM This library is distributed in the hope that it will be useful,
    @REM but WITHOUT ANY WARRANTY; without even the implied warranty of
    @REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    @REM Lesser General Public License for more details.
    @REM
    @REM You should have received a copy of the GNU Lesser General Public
    @REM License along with this project. If not, see <http://www.gnu.org/licenses/>.
    @REM *******************************************************************************
    @REM
    call variables.bat
    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
    g++ -std=c++11 ^
    -I"%JAVA_HOME%\include" ^
    -I"%JAVA_HOME%\include\win32" ^
    -I"%JAVA_HOME%\include_win" ^
    -I"%JAVA_HOME%\include_win\win32" ^
    -I"%ARMADILLO_HOME%\include" ^
    -L"%HOME%\lib" ^
    -L"%HOME%\lib\win" ^
    -o "%2\TestsForCurrentModel.exe" ^
    "%ARMADILLO_HOME%\include\catch_tests_main.o" ^
    "%1/test/tests_main.cpp" ^
    ......
    native/compileTestsArmadilloBackendOpenBLAS.sh 0 → 100644
    View file @ 37ccadf4
    #!/bin/bash
    #
    #
    # ******************************************************************************
    # MontiCAR Modeling Family, www.se-rwth.de
    # Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    # All rights reserved.
    #
    # This project is free software; you can redistribute it and/or
    # modify it under the terms of the GNU Lesser General Public
    # License as published by the Free Software Foundation; either
    # version 3.0 of the License, or (at your option) any later version.
    # This library is distributed in the hope that it will be useful,
    # but WITHOUT ANY WARRANTY; without even the implied warranty of
    # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    # Lesser General Public License for more details.
    #
    # You should have received a copy of the GNU Lesser General Public
    # License along with this project. If not, see <http://www.gnu.org/licenses/>.
    # *******************************************************************************
    #
    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
    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
    native/jdk/include/win32/jni_md.h deleted 100644 → 0
    View file @ 35fa2eee
    /*
    * Copyright (c) 1996, 1998, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    */
    #ifndef _JAVASOFT_JNI_MD_H_
    #define _JAVASOFT_JNI_MD_H_
    #define JNIEXPORT __declspec(dllexport)
    #define JNIIMPORT __declspec(dllimport)
    #define JNICALL __stdcall
    typedef long jint;
    typedef __int64 jlong;
    typedef signed char jbyte;
    #endif /* !_JAVASOFT_JNI_MD_H_ */
    native/jdk/include/classfile_constants.h → native/jdk/include_linux/classfile_constants.h
    View file @ 37ccadf4
    /*
    * Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    #ifndef CLASSFILE_CONSTANTS_H
    #define CLASSFILE_CONSTANTS_H
    ......
    native/jdk/include/jawt.h → native/jdk/include_linux/jawt.h
    View file @ 37ccadf4
    /*
    * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    #ifndef _JAVASOFT_JAWT_H_
    #define _JAVASOFT_JAWT_H_
    ......
    native/jdk/include/jdwpTransport.h → native/jdk/include_linux/jdwpTransport.h
    View file @ 37ccadf4
    /*
    * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    /*
    * Java Debug Wire Protocol Transport Service Provider Interface.
    */
    ......
    native/jdk/include/jni.h → native/jdk/include_linux/jni.h
    View file @ 37ccadf4
    /*
    * Copyright (c) 1996, 2013, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a copy of the GNU Lesser General Public
    * License along with this project. If not, see <http://www.gnu.org/licenses/>.
    * *******************************************************************************
    */
    /*
    * We used part of Netscape's Java Runtime Interface (JRI) as the starting
    * point of our design and implementation.
    ......
    native/jdk/include/jvmti.h → native/jdk/include_linux/jvmti.h
    View file @ 37ccadf4
    /*
    * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
    * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    *
    /**
    *
    * ******************************************************************************
    * MontiCAR Modeling Family, www.se-rwth.de
    * Copyright (c) 2017, Software Engineering Group at RWTH Aachen,
    * All rights reserved.
    *
    * This project is free software; you can redistribute it and/or
    * modify it under the terms of the GNU Lesser General Public
    * License as published by the Free Software Foundation; either
    * version 3.0 of the License, or (at your option) any later version.
    * This library is distributed in the hope that it will be useful,
    * but WITHOUT ANY WARRANTY; without even the implied warranty of
    * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    * Lesser General Public License for more details.
    *
    * You should have received a