Allow overlay for snap packages

This commit is contained in:
Michael Zanetti 2021-03-31 00:03:02 +02:00
parent 3080b33ee4
commit 4c62a769d8

View File

@ -12,19 +12,18 @@ withtests: {
tests.depends = libnymea-app tests.depends = libnymea-app
} }
# Building a Windows installer:
# Make sure your environment has the toolchain you want (e.g. msvc17 64 bit) by executing the command:
# $ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
# $ make wininstaller
wininstaller.depends = nymea-app
equals(OVERLAY_PATH, "") { equals(OVERLAY_PATH, "") {
PACKAGE_BASE_DIR = $$shell_path($$PWD)\packaging PACKAGE_BASE_DIR = $$shell_path($$PWD)\packaging
} else { } else {
PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging PACKAGE_BASE_DIR = $${OVERLAY_PATH}\packaging
} }
# Building a Windows installer:
# Make sure your environment has the toolchain you want (e.g. msvc17 64 bit) by executing the command:
# $ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
# $ make wininstaller
wininstaller.depends = nymea-app
PACKAGE_DIR = $${PACKAGE_BASE_DIR}\windows PACKAGE_DIR = $${PACKAGE_BASE_DIR}\windows
OLDSTRING="<Version>.*</Version>" OLDSTRING="<Version>.*</Version>"
NEWSTRING="<Version>$${APP_VERSION}</Version>" NEWSTRING="<Version>$${APP_VERSION}</Version>"
wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml\" && wininstaller.commands += @powershell -Command \"(gc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml) -replace \'$${OLDSTRING}\',\'$${NEWSTRING}\' | sc $${PACKAGE_DIR}\packages\\$${PACKAGE_URN}\meta\package.xml\" &&
@ -69,11 +68,11 @@ QMAKE_EXTRA_TARGETS += osxinstaller
# Generic linux desktop # Generic linux desktop
linux:!android: { linux:!android: {
desktopfile.files = packaging/linux-common/nymea-app.desktop desktopfile.files = $${PACKAGE_BASE_DIR}/linux-common/$${APPLICATION_NAME}.desktop
desktopfile.path = /usr/share/applications/ desktopfile.path = /usr/share/applications/
icons.files = packaging/linux-common/icons/ icons.files = $${PACKAGE_BASE_DIR}/linux-common/icons/
icons.path = /usr/share/ icons.path = /usr/share/
INSTALLS += desktopfile icons INSTALLS += desktopfile icons
} }
android: { android: {
@ -90,9 +89,9 @@ android: {
# Linux desktop (snap package) # Linux desktop (snap package)
snap: { snap: {
desktopfile.files = packaging/linux/nymea-app.desktop desktopfile.files = $${PACKAGE_BASE_DIR}/linux/$${APPLICATION_NAME}.desktop
desktopfile.path = /usr/share/applications/ desktopfile.path = /usr/share/applications/
INSTALLS += desktopfile INSTALLS += desktopfile
} }
ubports: { ubports: {