Commit 530a4ce4 authored by Jean Meurice's avatar Jean Meurice
Browse files

AWT fix

parent 402d762d
Pipeline #188321 passed with stages
in 6 minutes and 23 seconds
...@@ -47,8 +47,6 @@ linux_build: ...@@ -47,8 +47,6 @@ linux_build:
- g++ --version - g++ --version
script: script:
- chmod +x scripts/unix/build_dependencies.sh
- chmod +x scripts/unix/build_emulator.sh
- scripts/unix/build_dependencies.sh - scripts/unix/build_dependencies.sh
- scripts/unix/build_emulator.sh - scripts/unix/build_emulator.sh
artifacts: artifacts:
...@@ -70,16 +68,9 @@ linux_maven_master: ...@@ -70,16 +68,9 @@ linux_maven_master:
stage: maven stage: maven
image: maven:3-jdk-8 image: maven:3-jdk-8
before_script: before_script:
- apt update - scripts/unix/before_script.sh
- apt --assume-yes install libxext6
- apt --assume-yes install libxrender1
- apt --assume-yes install libxtst6
script: script:
- "JAWT_LIB=$(find / -name libjawt.so -print -quit)" - scripts/unix/awt_locate.sh
- "echo JAWT_LIB: $JAWT_LIB"
- "JAWT_FOLDER=$(dirname ${JAWT_LIB})"
- "echo JAWT_FOLDER: $JAWT_FOLDER"
- "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}"
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
only: only:
- master - master
...@@ -90,16 +81,9 @@ linux_maven_branch: ...@@ -90,16 +81,9 @@ linux_maven_branch:
stage: maven stage: maven
image: maven:3-jdk-8 image: maven:3-jdk-8
before_script: before_script:
- apt update - scripts/unix/before_script.sh
- apt --assume-yes install libxext6
- apt --assume-yes install libxrender1
- apt --assume-yes install libxtst6
script: script:
- "JAWT_LIB=$(find / -name libjawt.so -print -quit)" - scripts/unix/awt_locate.sh
- "echo JAWT_LIB: $JAWT_LIB"
- "JAWT_FOLDER=$(dirname ${JAWT_LIB})"
- "echo JAWT_FOLDER: $JAWT_FOLDER"
- "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}"
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
except: except:
- master - master
......
/**
* (c) https://github.com/MontiCore/monticore
*
* The license generally applicable for this project
* can be found under https://github.com/MontiCore/monticore.
*/
/* DO NOT EDIT THIS FILE - it is machine generated */ /* DO NOT EDIT THIS FILE - it is machine generated */
#include <jni.h> #include <jni.h>
/* Header for class de_rwth_monticore_EmbeddedMontiArc_simulators_hardware_emulator_HardwareEmulatorInterface */ /* Header for class de_rwth_monticore_EmbeddedMontiArc_simulators_hardware_emulator_HardwareEmulatorInterface */
......
#!/bin/bash
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
JAWT_LIB=$(find / -name libjawt.so -print -quit)
AWT_LIB=$(find / -name libawt.so -print -quit)
echo JAWT_LIB: $JAWT_LIB
echo AWT_LIB: $AWT_LIB
JAWT_FOLDER=$(dirname ${JAWT_LIB})
AWT_FOLDER=$(dirname ${AWT_LIB})
echo JAWT_FOLDER: $JAWT_FOLDER
echo AWT_FOLDER: $AWT_FOLDER
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}:${AWT_FOLDER}
\ No newline at end of file
#!/bin/bash
#
# (c) https://github.com/MontiCore/monticore
#
# The license generally applicable for this project
# can be found under https://github.com/MontiCore/monticore.
#
apt update
apt --assume-yes install libxext6
apt --assume-yes install libxrender1
apt --assume-yes install libxtst6
\ No newline at end of file
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