Add required executables into main app bundle

This commit is contained in:
RigoLigo 2022-05-28 20:43:07 +08:00
parent ed03d6850f
commit 07e74952ec
2 changed files with 22 additions and 3 deletions

View File

@ -430,6 +430,7 @@ unix: {
settingsdialog/formatterpathwidget.ui \ settingsdialog/formatterpathwidget.ui \
settingsdialog/environmentprogramswidget.ui settingsdialog/environmentprogramswidget.ui
} }
linux: { linux: {
LIBS+= \ LIBS+= \
-lrt -lrt
@ -500,3 +501,17 @@ RESOURCES += qmake_qm_files
RESOURCES += iconsets_files RESOURCES += iconsets_files
RESOURCES += theme_files RESOURCES += theme_files
RESOURCES += colorscheme_files RESOURCES += colorscheme_files
macos: {
message($$OUT_PWD/astyle/astyle)
# Add needed executables into the main app bundle
bundled_executable.files = \
$$OUT_PWD/../astyle/astyle \
$$OUT_PWD/../consolepauser/consolepauser \
$$OUT_PWD/../redpanda-git-askpass/redpanda-git-askpass.app/Contents/MacOS/redpanda-git-askpass
bundled_executable.path = Contents/MacOS
QMAKE_BUNDLE_DATA += bundled_executable
}

View File

@ -5,14 +5,20 @@ SUBDIRS += \
astyle \ astyle \
consolepauser consolepauser
# Add the dependencies so that the RedPandaIDE project can add the depended programs
# into the main app bundle
RedPandaIDE.depends = astyle consolepauser
win32: { win32: {
SUBDIRS += \ SUBDIRS += \
redpanda-win-git-askpass redpanda-win-git-askpass
RedPandaIDE.depends += redpanda-win-git-askpass
} }
macos,linux: { unix: {
SUBDIRS += \ SUBDIRS += \
redpanda-git-askpass redpanda-git-askpass
RedPandaIDE.depends += redpanda-git-askpass
} }
APP_NAME = RedPandaCPP APP_NAME = RedPandaCPP
@ -20,7 +26,6 @@ APP_NAME = RedPandaCPP
APP_VERSION = 1.0.8 APP_VERSION = 1.0.8
linux: { linux: {
isEmpty(PREFIX) { isEmpty(PREFIX) {
PREFIX = /usr/local PREFIX = /usr/local
} }
@ -44,7 +49,6 @@ linux: {
desktop.path = $${PREFIX}/share/applications desktop.path = $${PREFIX}/share/applications
desktop.files += linux/redpandaide.desktop desktop.files += linux/redpandaide.desktop
INSTALLS += desktop INSTALLS += desktop
} }
win32: { win32: {