From 4a94520f2e6eb55f9d651321b15ed638404a66bb Mon Sep 17 00:00:00 2001 From: Ken Moore Date: Mon, 11 Jan 2016 15:51:52 -0500 Subject: Large cleanup of the Lumina project files and OS-detection/support systems. 1) Setup all the subprojects to use the new OS-detect.pri subfile 2) Automatically detect/set the build datetime string for the project when qmake is run. 3) Automatically read/embed the current GIT revision into the Lumina version string 4) Remove the old QtConfig shortcut function from the LuminaOS class (and all templates). --- lumina-desktop/lumina-desktop.pro | 50 ++++++++++++--------------------------- 1 file changed, 15 insertions(+), 35 deletions(-) (limited to 'lumina-desktop/lumina-desktop.pro') diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro index 4315b2a5..113bd9cf 100644 --- a/lumina-desktop/lumina-desktop.pro +++ b/lumina-desktop/lumina-desktop.pro @@ -1,30 +1,18 @@ +include($${PWD}/../OS-detect.pri) QT += core gui network greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras multimedia quickwidgets concurrent svg TARGET = Lumina-DE -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin +target.path = $$DESTDIR$${L_BINDIR} -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -lxcb -lxcb-damage -QMAKE_LIBDIR = ../libLumina +LIBS += -lLuminaUtils -lxcb -lxcb-damage DEPENDPATH += ../libLumina TEMPLATE = app -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - SOURCES += main.cpp \ WMProcess.cpp \ @@ -68,45 +56,37 @@ include(desktop-plugins/desktop-plugins.pri) RESOURCES+= Lumina-DE.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include - -desktop.files = Lumina-DE.desktop -linux-* { -desktop.path = /usr/share/xsessions -} else { -desktop.path = $$PREFIX/share/xsessions -} +desktop.path = $${L_SESSDIR} icons.files = Lumina-DE.png \ Insight-FileManager.png - -icons.path = $$PREFIX/share/pixmaps +icons.path = $${L_SHAREDIR}/pixmaps fluxconf.files = fluxboxconf/fluxbox-init-rc \ fluxboxconf/fluxbox-keys -fluxconf.path = $$PREFIX/share/Lumina-DE/ +fluxconf.path = $${L_SHAREDIR}/Lumina-DE/ wallpapers.files = wallpapers/Lumina_Wispy_gold.jpg \ wallpapers/Lumina_Wispy_green.jpg \ wallpapers/Lumina_Wispy_purple.jpg \ wallpapers/Lumina_Wispy_red.jpg -wallpapers.path = $$PREFIX/share/wallpapers/Lumina-DE +wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE defaults.files = defaults/luminaDesktop.conf \ audiofiles/Logout.ogg \ audiofiles/Login.ogg -defaults.path = $$PREFIX/share/Lumina-DE/ +defaults.path = $${L_SHAREDIR}/Lumina-DE/ -conf.path = $$PREFIX/etc +conf.path = $${L_ETCDIR} #Now do any PC-BSD defaults (if set) PCBSD{ - conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist - defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg + conf.extra = cp defaults/luminaDesktop.pcbsd.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + defaults.extra = cp defaults/desktop-background.pcbsd.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg }else{ - conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$$PREFIX/etc/luminaDesktop.conf.dist - defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/desktop-background.jpg + conf.extra = cp defaults/luminaDesktop.conf $(INSTALL_ROOT)$${L_ETCDIR}/luminaDesktop.conf.dist + defaults.extra = cp defaults/desktop-background.jpg $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/desktop-background.jpg } TRANSLATIONS = i18n/lumina-desktop_af.ts \ @@ -172,8 +152,8 @@ TRANSLATIONS = i18n/lumina-desktop_af.ts \ i18n/lumina-desktop_zh_TW.ts \ i18n/lumina-desktop_zu.ts -dotrans.path=$$PREFIX/share/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ INSTALLS += target desktop icons wallpapers defaults conf fluxconf dotrans -- cgit