mirror of
https://github.com/CalcProgrammer1/OpenRGB.git
synced 2026-05-05 21:26:48 -04:00
Changing the Linux executable (only) to lowercase openrgb
Commits squashed by Adam Honse <calcprogrammer1@gmail.com>
This commit is contained in:
Chris
28
scripts/AppImage.patch
Normal file
28
scripts/AppImage.patch
Normal file
@@ -0,0 +1,28 @@
|
||||
|
||||
|
||||
diff --git a/OpenRGB.pro b/OpenRGB.pro
|
||||
index 0b308bb9..75a2199f 100644
|
||||
--- a/OpenRGB.pro
|
||||
+++ b/OpenRGB.pro
|
||||
@@ -634,8 +634,6 @@ win32:contains(QMAKE_TARGET.arch, x86) {
|
||||
# Linux-specific Configuration #
|
||||
#-----------------------------------------------------------------------------------------------#
|
||||
unix:!macx {
|
||||
- TARGET = $$lower($$TARGET)
|
||||
-
|
||||
INCLUDEPATH += \
|
||||
Controllers/FaustusController \
|
||||
Controllers/LinuxLEDController \
|
||||
diff --git a/qt/OpenRGB.desktop b/qt/OpenRGB.desktop
|
||||
index bd71a38a..b4a0f86a 100644
|
||||
--- a/qt/OpenRGB.desktop
|
||||
+++ b/qt/OpenRGB.desktop
|
||||
@@ -3,7 +3,7 @@ Type=Application
|
||||
Encoding=UTF-8
|
||||
Name=OpenRGB
|
||||
Comment=Control RGB lighting
|
||||
-Exec=openrgb
|
||||
+Exec=OpenRGB
|
||||
Icon=OpenRGB
|
||||
Terminal=false
|
||||
Categories=Utility;
|
||||
@@ -1,76 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# OpenRGB AppImage 32-bit Build Script #
|
||||
#-----------------------------------------------------------------------#
|
||||
|
||||
set -x
|
||||
set -e
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Build in a temporary directory to keep the system clean #
|
||||
# Use RAM disk if possible (if available and not building on a CI #
|
||||
# system like Travis) #
|
||||
#-----------------------------------------------------------------------#
|
||||
if [ "$CI" == "" ] && [ -d /dev/shm ]; then
|
||||
TEMP_BASE=/dev/shm
|
||||
else
|
||||
TEMP_BASE=/tmp
|
||||
fi
|
||||
|
||||
BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" appimage-build-XXXXXX)
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Make sure to clean up build dir, even if errors occur #
|
||||
#-----------------------------------------------------------------------#
|
||||
cleanup () {
|
||||
if [ -d "$BUILD_DIR" ]; then
|
||||
rm -rf "$BUILD_DIR"
|
||||
fi
|
||||
}
|
||||
trap cleanup EXIT
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Store repo root as variable #
|
||||
#-----------------------------------------------------------------------#
|
||||
REPO_ROOT=$(readlink -f $(dirname $(dirname $0)))
|
||||
OLD_CWD=$(readlink -f .)
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Switch to build dir #
|
||||
#-----------------------------------------------------------------------#
|
||||
pushd "$BUILD_DIR"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Configure build files with qmake #
|
||||
# we need to explicitly set the install prefix, as qmake's default is #
|
||||
# /usr/local for some reason... #
|
||||
#-----------------------------------------------------------------------#
|
||||
qmake "$REPO_ROOT"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Build project and install files into AppDir #
|
||||
#-----------------------------------------------------------------------#
|
||||
make -j$(nproc)
|
||||
make install INSTALL_ROOT=AppDir
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Make them executable #
|
||||
#-----------------------------------------------------------------------#
|
||||
chmod +x "$REPO_ROOT"/scripts/tools/linuxdeploy*.AppImage
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Make sure Qt plugin finds QML sources so it can deploy the imported #
|
||||
# files #
|
||||
#-----------------------------------------------------------------------#
|
||||
export QML_SOURCES_PATHS="$REPO_ROOT"/src
|
||||
|
||||
"$REPO_ROOT"/scripts/tools//linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop
|
||||
"$REPO_ROOT"/scripts/tools//linuxdeploy-plugin-qt-i386.AppImage --appimage-extract-and-run --appdir AppDir
|
||||
"$REPO_ROOT"/scripts/tools//linuxdeploy-i386.AppImage --appimage-extract-and-run --appdir AppDir --output appimage
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Move built AppImage back into original CWD #
|
||||
#-----------------------------------------------------------------------#
|
||||
mv OpenRGB*.AppImage "$OLD_CWD"
|
||||
|
||||
@@ -17,9 +17,27 @@ if [ "$CI" == "" ] && [ -d /dev/shm ]; then
|
||||
else
|
||||
TEMP_BASE=/tmp
|
||||
fi
|
||||
|
||||
BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" appimage-build-XXXXXX)
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# This checks the Architecture of the system to work out if we're #
|
||||
# building on i386 or x86_64 and saves for later use #
|
||||
#-----------------------------------------------------------------------#
|
||||
|
||||
if [ ${DEB_HOST_ARCH:0:1} == ${DEB_HOST_GNU_CPU:0:1} ]; then
|
||||
ARCH="$DEB_HOST_ARCH"
|
||||
else
|
||||
ARCH="$DEB_HOST_GNU_CPU"
|
||||
fi
|
||||
echo Inputs: "$DEB_HOST_ARCH" "$DEB_HOST_GNU_CPU"
|
||||
echo Calculated: "$ARCH"
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Small fixes for CamelCase vs lowercase #
|
||||
#-----------------------------------------------------------------------#
|
||||
TARGET=OpenRGB
|
||||
patch -p1 -i scripts/AppImage.patch
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Make sure to clean up build dir, even if errors occur #
|
||||
#-----------------------------------------------------------------------#
|
||||
@@ -51,7 +69,7 @@ qmake "$REPO_ROOT"
|
||||
#-----------------------------------------------------------------------#
|
||||
# Build project and install files into AppDir #
|
||||
#-----------------------------------------------------------------------#
|
||||
make -j$(nproc)
|
||||
make -j$(nproc) TARGET="$TARGET"
|
||||
make install INSTALL_ROOT=AppDir
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
@@ -65,12 +83,12 @@ chmod +x "$REPO_ROOT"/scripts/tools/linuxdeploy*.AppImage
|
||||
#-----------------------------------------------------------------------#
|
||||
export QML_SOURCES_PATHS="$REPO_ROOT"/src
|
||||
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir -e OpenRGB -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-plugin-qt-x86_64.AppImage --appimage-extract-and-run --appdir AppDir
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-x86_64.AppImage --appimage-extract-and-run --appdir AppDir --output appimage
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir -e "$TARGET" -i "$REPO_ROOT"/qt/OpenRGB.png -d "$REPO_ROOT"/qt/OpenRGB.desktop
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-plugin-qt-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir
|
||||
"$REPO_ROOT"/scripts/tools/linuxdeploy-"$ARCH".AppImage --appimage-extract-and-run --appdir AppDir --output appimage
|
||||
|
||||
#-----------------------------------------------------------------------#
|
||||
# Move built AppImage back into original CWD #
|
||||
#-----------------------------------------------------------------------#
|
||||
mv OpenRGB*.AppImage "$OLD_CWD"
|
||||
mv -v "$TARGET"*.AppImage "$OLD_CWD"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user