ci skip: update create-app to allow custom environment file

Author: jcelerier

tools/create-app-linux.sh

@@ -95,8 +95,7 @@ fi
 
 # Create custom AppRun script
 echo "Creating custom launcher..."
-if [[ -n "$SCORE_BASENAME" ]]; then
-    # With score
+
     cat > AppRun << APPRUN_EOF
 #!/bin/sh
 
@@ -108,6 +107,15 @@ export SCORE_CUSTOM_APP_APPLICATION_VERSION="$APP_VERSION"
 export QML2_IMPORT_PATH="\${APPDIR}/usr/bin/qml/"
 export LD_LIBRARY_PATH="\${APPIMAGE_LIBRARY_PATH}:\${APPDIR}/usr/lib:\${LD_LIBRARY_PATH}"
 "\${APPDIR}/usr/bin/linuxcheck" "\${APPDIR}/usr/bin/app-bin"
+APPRUN_EOF
+
+if [[ -n "$APP_ENVIRONMENT" ]]; then
+    cat "$APP_ENVIRONMENT" >> AppRun
+fi
+
+if [[ -n "$SCORE_BASENAME" ]]; then
+    # With score
+    cat >> AppRun << APPRUN_EOF
 
 # Launch with custom UI and score
 exec "\${APPDIR}/usr/bin/app-bin" \
@@ -118,17 +126,7 @@ exec "\${APPDIR}/usr/bin/app-bin" \
 APPRUN_EOF
 else
     # Without custom score
-    cat > AppRun << APPRUN_EOF
-#!/bin/sh
-
-export SCORE_CUSTOM_APP_ORGANIZATION_NAME="$APP_ORGANIZATION"
-export SCORE_CUSTOM_APP_ORGANIZATION_DOMAIN="$APP_DOMAIN"
-export SCORE_CUSTOM_APP_APPLICATION_NAME="$APP_NAME"
-export SCORE_CUSTOM_APP_APPLICATION_VERSION="$APP_VERSION"
-
-export QML2_IMPORT_PATH="\${APPDIR}/usr/bin/qml/"
-export LD_LIBRARY_PATH="\${APPIMAGE_LIBRARY_PATH}:\${APPDIR}/usr/lib:\${LD_LIBRARY_PATH}"
-"\${APPDIR}/usr/bin/linuxcheck" "\${APPDIR}/usr/bin/app-bin"
+    cat >> AppRun << APPRUN_EOF
 
 # Launch with custom UI
 exec "\${APPDIR}/usr/bin/app-bin" \

tools/create-app-macos.sh

@@ -187,9 +187,8 @@ fi
 
 # Create launcher script
 echo "Creating custom launcher..."
-if [[ -n "$SCORE_BASENAME" ]]; then
-    # With score
-    cat > "$BUNDLE_MACOS/$APP_NAME" << LAUNCHER_EOF
+
+cat > "$BUNDLE_MACOS/$APP_NAME" << LAUNCHER_EOF
 #!/bin/bash
 
 export SCORE_CUSTOM_APP_ORGANIZATION_NAME="$APP_ORGANIZATION"
@@ -200,6 +199,16 @@ export SCORE_CUSTOM_APP_APPLICATION_VERSION="$APP_VERSION"
 SCRIPT_DIR="\$(cd "\$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
 RESOURCES_DIR="\$(cd "\$SCRIPT_DIR/../Resources" && pwd)"
 export QML2_IMPORT_PATH="\${RESOURCES_DIR}/qml/"
+
+LAUNCHER_EOF
+
+if [[ -n "$APP_ENVIRONMENT" ]]; then
+    cat "$APP_ENVIRONMENT" >> "$BUNDLE_MACOS/$APP_NAME" 
+fi
+
+if [[ -n "$SCORE_BASENAME" ]]; then
+    # With score
+    cat >> "$BUNDLE_MACOS/$APP_NAME" << LAUNCHER_EOF
 exec "\$SCRIPT_DIR/app-bin" \
     ${AUTOPLAY} \
     --ui "\${RESOURCES_DIR}/qml/${MAIN_QML}" \
@@ -208,18 +217,7 @@ exec "\$SCRIPT_DIR/app-bin" \
 LAUNCHER_EOF
 else
     # Without autoplay
-    cat > "$BUNDLE_MACOS/$APP_NAME" << LAUNCHER_EOF
-#!/bin/bash
-
-export SCORE_CUSTOM_APP_ORGANIZATION_NAME="$APP_ORGANIZATION"
-export SCORE_CUSTOM_APP_ORGANIZATION_DOMAIN="$APP_DOMAIN"
-export SCORE_CUSTOM_APP_APPLICATION_NAME="$APP_NAME"
-export SCORE_CUSTOM_APP_APPLICATION_VERSION="$APP_VERSION"
-
-SCRIPT_DIR="\$(cd "\$(dirname "\${BASH_SOURCE[0]}")" && pwd)"
-RESOURCES_DIR="\$(cd "\$SCRIPT_DIR/../Resources" && pwd)"
-export QML2_IMPORT_PATH="\${RESOURCES_DIR}/qml/"
-
+    cat >> "$BUNDLE_MACOS/$APP_NAME" << LAUNCHER_EOF
 exec "\$SCRIPT_DIR/app-bin" \
     ${AUTOPLAY} \
     --ui "\${RESOURCES_DIR}/qml/${MAIN_QML}" \

tools/create-app-windows.sh

@@ -129,7 +129,7 @@ echo "Creating native launcher executable..."
 
 # Generate C source code
 echo " =========== "
-cp "$SCORE_SOURCE_DIR/tools/launcher/launcher.c" launcher.c
+cp "$SCORE_SOURCE_DIR/tools/launcher/launcher.cpp" launcher.cpp
 cat > launcher-defines.h << EOF
 #pragma once
 
@@ -145,26 +145,38 @@ cat > launcher-defines.h << EOF
 
 EOF
 
+if [[ -n "$APP_ENVIRONMENT" ]]; then
+    echo "#undef SCORE_ENVIRONMENT" >> launcher-defines.h
+    echo '#define SCORE_ENVIRONMENT R"___(' >> launcher-defines.h
+    cat "$APP_ENVIRONMENT" >> launcher-defines.h
+    echo ')___"' >> launcher-defines.h
+else
+    echo '#define SCORE_ENVIRONMENT ""' >> launcher-defines.h
+fi
+
 # Compile the launcher
 # Try clang first, then fall back to CC (usually gcc or msvc cl)
 COMPILER=""
-if command -v clang &> /dev/null; then
-    COMPILER="clang"
-    echo "Using clang to compile launcher"
-elif [[ -n "${CC:-}" ]] && command -v "$CC" &> /dev/null; then
-    COMPILER="$CC"
-    echo "Using $CC to compile launcher"
-elif command -v gcc &> /dev/null; then
-    COMPILER="gcc"
-    echo "Using gcc to compile launcher"
+if command -v 'clang++' &> /dev/null; then
+    COMPILER="clang++"
+    CXXFLAGS="-O3 -std=c++20 -Xlinker -SUBSYSTEM:WINDOWS"
+    echo "Using clang++ to compile launcher"
+elif [[ -n "${CXX:-}" ]] && command -v "$CXX" &> /dev/null; then
+    COMPILER="$CXX"
+    CXXFLAGS="-O3 -std=c++20 -mwindows"
+    echo "Using $CXX to compile launcher"
+elif command -v 'g++' &> /dev/null; then
+    COMPILER="g++"
+    CXXFLAGS="-O3 -mwindows"
+    echo "Using g++ to compile launcher"
 else
     echo "Warning: No C compiler found (tried clang, \$CC, gcc)"
     echo "Falling back to batch script launcher"
     exit 1
 fi
 
-$COMPILER -O3 -o "${APP_NAME}.exe" launcher.c -luser32
-rm -f launcher.c launcher-defines.h
+$COMPILER $CXXFLAGS -o "${APP_NAME}.exe" launcher.cpp -luser32 -lshell32
+rm -f launcher.cpp launcher-defines.h
 
 # Set icon and properties
 if [[ -f "${APP_ICON_ICO}" ]]; then

tools/create-app.sh

@@ -18,6 +18,7 @@ APP_NAME_SAFE=""
 APP_APPDATA_XML=""
 APP_COPYRIGHT=""
 APP_DESCRIPTION=""
+APP_ENVIRONMENT=""
 APP_ORGANIZATION=""
 APP_DOMAIN=""
 APP_IDENTIFIER=""
@@ -57,17 +58,18 @@ Optional:
                         macos-intel, macos-arm, windows
                         Can be specified multiple times. If not specified,
                         builds for current platform.
-    --app-organization  Set the app organization (e.g. ossia)
-    --app-domain        Set the app domain (e.g. ossia.io)
-    --app-identifier    Set the app identifier (e.g. io.ossia.score)
-    --app-description   Set the app description (one line max)
-    --app-copyright     Set the app copyright (e.g. ossia.io)
-    --app-version       Set the app version (e.g. 1.0-rc3)
     --app-appdata-xml   Set the app appdata.xml file (Linux)
-    --app-ico           Set the app icon (ico format, Windows)
+    --app-copyright     Set the app copyright (e.g. ossia.io)
+    --app-description   Set the app description (one line max)
+    --app-domain        Set the app domain (e.g. ossia.io)
+    --app-environment   Set a file containing environment variables to set
     --app-icns          Set the app icon (icns format, macOS)
+    --app-ico           Set the app icon (ico format, Windows)
+    --app-identifier    Set the app identifier (e.g. io.ossia.score)
+    --app-organization  Set the app organization (e.g. ossia)
     --app-png           Set the app icon (png format, Linux)
     --app-qrc           Optional qrc resource file
+    --app-version       Set the app version (e.g. 1.0-rc3)
     --help              Show this help message
 
 Example:
@@ -124,6 +126,10 @@ while [[ $# -gt 0 ]]; do
             APP_NAME="$2"
             shift 2
             ;;
+        --app-environment)
+            APP_ENVIRONMENT="$2"
+            shift 2
+            ;;
         --app-organization)
             APP_ORGANIZATION="$2"
             shift 2
@@ -314,6 +320,7 @@ export APP_COPYRIGHT
 export APP_DESCRIPTION
 export APP_ORGANIZATION
 export APP_DOMAIN
+export APP_ENVIRONMENT
 export APP_IDENTIFIER
 export APP_ICON_ICO
 export APP_ICON_ICNS

tools/launcher/launcher-defines.h

@@ -10,3 +10,5 @@
 #define SCORE_CUSTOM_APP_ORGANIZATION_DOMAIN "$SCORE_CUSTOM_APP_ORGANIZATION_DOMAIN"
 #define SCORE_CUSTOM_APP_APPLICATION_NAME "$SCORE_CUSTOM_APP_APPLICATION_NAME"
 #define SCORE_CUSTOM_APP_APPLICATION_VERSION "$SCORE_CUSTOM_APP_APPLICATION_VERSION"
+
+#define SCORE_ENVIRONMENT ""