build console with make bundle

.github/workflows/build-firmware.yaml

@@ -572,11 +572,6 @@ jobs:
         echo "RUSEFI_SSH_USER=${{secrets.RUSEFI_SSH_USER}}" >> $GITHUB_ENV
         echo "RUSEFI_SSH_PASS=${{secrets.RUSEFI_SSH_PASS}}" >> $GITHUB_ENV
 
-    # Build rusEFI console
-    - name: Build console
-      if: ${{ env.full == 'true' }}
-      run: bash misc/jenkins/build_java_console.sh
-
 #    - name: Download LibOpenBLT Tool (Linux)
 #      uses: actions/download-artifact@v3
 #      with:

.github/workflows/custom-board-build.yaml

@@ -170,10 +170,6 @@ jobs:
         working-directory: generated/tunerstudio/generated
         run: ../../../${{inputs.rusefi_dir}}/firmware/tunerstudio/upload_ini.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}
 
-      - name: Build console
-        working-directory: ${{inputs.rusefi_dir}}
-        run: bash misc/jenkins/build_java_console.sh
-
       - name: Build Firmware
         working-directory: ${{inputs.rusefi_dir}}/firmware
         run: bash bin/compile.sh -b ${{ env.BOARD_META_PATH }} deliver/rusefi.bin

firmware/bundle.mk

@@ -108,7 +108,15 @@ BUNDLE_FILES = \
   $(FOLDER_TARGETS) \
   $(CONSOLE_FOLDER_TARGETS)
 
-$(SIMULATOR):
+FLOCK = flock /tmp/java.lock
+
+$(CONSOLE_OUT):
+	cd ../java_tools && $(FLOCK) ./gradlew :ui:shadowJar
+
+$(AUTOUPDATE_OUT):
+	cd ../java_tools && $(FLOCK) ./gradlew :autoupdate:jar
+
+$(SIMULATOR_OUT):
 	$(MAKE) -C ../simulator -r SIMULATOR_DEBUG_LEVEL_OPT="-O2" OS="Windows_NT"
 
 $(BOOTLOADER_HEX) $(BOOTLOADER_BIN): .bootloader-sentinel ;

misc/jenkins/build_java_console.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-echo "java version"
-java -version
-
-echo "Building java console"
-pwd
-cd java_tools
-./gradlew :ui:shadowJar
-cd ..
-
-[ -e java_console_binary/rusefi_console.jar ] || { echo "CONSOLE COMPILATION FAILED"; exit 1; }
-echo "java console looks good"
-
-cd java_tools
-./gradlew :autoupdate:jar
-cd ..
-
-[ -e java_console_binary/rusefi_autoupdate.jar ] || { echo "AUTO-UPDATE COMPILATION FAILED"; exit 1; }
-echo "auto-update looks good"
-
-# this is a bit dead
-#not really needed in 2024
-#echo "Building TS plugin"
-#cd java_tools
-#./gradlew :ts_plugin_launcher:shadowJar
-#cd ..
-
-#[ -e java_tools/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar ] || { echo "PLUGIN COMPILATION FAILED"; exit 1; }
-#echo "TS plugin looks good"