andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build adjustments for jni lib

This commit is contained in:
Matthew Kennedy 2023-11-04 01:12:35 -04:00 committed by rusefillc
parent 5c96bff889
commit c8bda54ed7
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.github/workflows/build-firmware.yaml vendored
View File

@ -12,7 +12,7 @@ on:
required: false
type: boolean
jobs:
build-openblt-tools-linux:
build-libopenblt-linux:
runs-on: ubuntu-latest
steps:
@ -20,21 +20,29 @@ jobs:
with:
submodules: true
- name: cmake configure libopenblt
working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
run: cmake ..
- name: cmake configure libopenblt
working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
run: cmake -DCMAKE_BUILD_TYPE=Release ..
# - name: make libopenblt
# working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
# run: make -j8
# - name: make libopenblt
# working-directory: ./firmware/ext/openblt/Host/Source/LibOpenBLT/build
# run: make -j8
- name: cmake configure BootCommander
working-directory: ./firmware/ext/openblt/Host/Source/BootCommander/build
run: cmake ..
- name: cmake configure libopenblt_jni
working-directory: ./misc/libopenblt_jni/build
run: cmake -DCMAKE_BUILD_TYPE=Release ..
# - name: make libopenblt_jni
# working-directory: ./misc/libopenblt_jni/build
# run: make -j8
# - uses: actions/upload-artifact@v3
# with:
# name: libopenblt-linux
# path: |
# ./firmware/ext/openblt/Host/libopenblt.so
# ./misc/libopenblt_jni/build/libopenblt_jni.so
# - name: make BootCommander
# working-directory: ./firmware/ext/openblt/Host/Source/BootCommander/build
# run: make -j8
release:
runs-on: ubuntu-latest
@ -89,7 +97,8 @@ jobs:
build-firmware:
runs-on: ubuntu-latest
needs: [
#build-openblt-tools-linux,
#build-libopenblt-linux,
#build-libopenblt-macos,
release]
strategy:
@ -556,17 +565,17 @@ jobs:
# 'OS="Windows_NT"' allows us to build Windows executable on unix
run: OS="Windows_NT" bash misc/jenkins/build_simulator.sh
# - name: check openblt
# run: ls -l ./firmware/ext/openblt/Host/
# - name: Download OpenBLT BootCommander Tool
# - name: Download LibOpenBLT Tool (Linux)
# uses: actions/download-artifact@v3
# with:
# name: bootcomander-linux
# name: libopenblt-linux
# path: ./firmware/ext/openblt/Host/
# - name: check openblt
# run: ls -l ./firmware/ext/openblt/Host/
# - name: Download LibOpenBLT Tool (MacOS)
# uses: actions/download-artifact@v3
# with:
# name: libopenblt-macos
# path: ./firmware/ext/openblt/Host/
# Build the firmware!
- name: Build Firmware

15
misc/jenkins/build_working_folder.sh
View File

@ -26,12 +26,12 @@ mkdir $FOLDER
CONSOLE_FOLDER="$FOLDER/console"
DRIVERS_FOLDER="$FOLDER/drivers"
OPENBLT_FOLDER="$CONSOLE_FOLDER/openblt"
update_ts_cacerts_FOLDER="$FOLDER/update-ts-cacerts"
mkdir $CONSOLE_FOLDER
mkdir $DRIVERS_FOLDER
mkdir $OPENBLT_FOLDER
mkdir $update_ts_cacerts_FOLDER
ls -l $FOLDER
@ -69,11 +69,12 @@ cp misc/console_launcher/rusefi_updater.exe $FOLDER
cp misc/console_launcher/update-ts-cacerts/* $update_ts_cacerts_FOLDER
cp java_console/*.dll $CONSOLE_FOLDER
cp -r java_console/bin $FOLDER
cp firmware/ext/openblt/Host/BootCommander.exe $OPENBLT_FOLDER
cp firmware/ext/openblt/Host/libopenblt.dll $OPENBLT_FOLDER
# todo: fix build-openblt-tools-linux job first!
#cp firmware/ext/openblt/Host/BootCommander $OPENBLT_FOLDER
#cp firmware/ext/openblt/Host/libopenblt.so $OPENBLT_FOLDER
cp firmware/ext/openblt/Host/libopenblt.dll $CONSOLE_FOLDER
#cp firmware/ext/openblt/Host/libopenblt.so $CONSOLE_FOLDER
#cp firmware/ext/openblt/Host/libopenblt.dylib $CONSOLE_FOLDER
#cp firmware/ext/openblt/Host/libopenblt_jni.dll $CONSOLE_FOLDER
#cp firmware/ext/openblt/Host/libopenblt_jni.so $CONSOLE_FOLDER
#cp firmware/ext/openblt/Host/libopenblt_jni.dylib $CONSOLE_FOLDER
cp misc/console_launcher/readme.html $FOLDER