i18n-projects

@@ -4,13 +4,19 @@
 # XXXXXX_LANG.ts <Qt project dir>
 # ^^^^^^ File prefix for .ts file
 
-lumina-config lumina-config 
-lumina-desktop lumina-desktop
-lumina-fm lumina-fm
-lumina-open lumina-open
-lumina-screenshot lumina-screenshot
-lumina-search lumina-search
-lumina-info lumina-info
-lumina-fileinfo lumina-fileinfo
-lumina-xconfig lumina-xconfig
+#Core
+lumina-desktop src-qt5/core/lumina-desktop
+lumina-info src-qt5/core/lumina-info
+lumina-open src-qt5/core/lumina-open
 
+#Core Utilities
+lumina-config src-qt5/core-utils/lumina-config
+lumina-search src-qt5/core-utils/lumina-search
+lumina-xconfig src-qt5/core-utils/lumina-xconfig
+
+#Desktop Utilities
+lumina-fm src-qt5/desktop-utils/lumina-fm
+lumina-textedit src-qt5/desktop-utils/lumina-textedit
+lumina-fileinfo src-qt5/desktop-utils/lumina-fileinfo
+#lumina-terminal src-qt5/desktop-utils/lumina-terminal
+lumina-screenshot src-qt5/desktop-utils/lumina-screenshot

lumina.pro

@@ -1,27 +1,6 @@
-
-include("OS-detect.pri")
-
+#=======================================================
+#  This is just a simple redirect into the source tree for builds
+#=======================================================
 TEMPLATE = subdirs
-CONFIG += recursive
-
-SUBDIRS+= libLumina \
-	 lumina-desktop \
-	 lumina-open \
-	 lumina-config \
-	 lumina-fm \
-	 lumina-screenshot \
-	 lumina-search \
-	 lumina-info \
-	 lumina-xconfig \
-	 lumina-fileinfo
 
-#Make sure to list libLumina as a requirement for the others (for parallellized builds)
-lumina-desktop.depends = libLumina
-lumina-open.depends = libLumina
-lumina-config.depends = libLumina
-lumina-fm.depends = libLumina
-lumina-screenshot.depends = libLumina
-lumina-search.depends = libLumina
-lumina-info.depends = libLumina
-lumina-xconfig.depends = libLumina
-lumina-fileinfo.depends = libLumina
+SUBDIRS+= src-qt5

OS-detect.pri → src-qt5/OS-detect.pri

@@ -23,9 +23,9 @@ isEmpty(OS){
   message("Build OS Info: $${QMAKE_HOST.os}, $${QMAKE_HOST.arch}, $${QMAKE_HOST.version_string}")
 
   #Load the initial library/includefile search locations (more can be added in the OS-specific sections below)
-  LIBS = -L$${PWD}/libLumina -L$$[QT_INSTALL_LIBS]
-  INCLUDEPATH = $${PWD}/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX]
-  QMAKE_LIBDIR =  $${PWD}/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX
+  LIBS = -L$${PWD}/core/libLumina -L$$[QT_INSTALL_LIBS]
+  INCLUDEPATH = $${PWD}/core/libLumina $$[QT_INSTALL_HEADERS] $$[QT_INSTALL_PREFIX]
+  QMAKE_LIBDIR =  $${PWD}/core/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX
 
   #Setup the default values for build settings (if not explicitly set previously)
   isEmpty(PREFIX){ PREFIX=/usr/local }

src-qt5/core-utils/core-utils.pro

@@ -0,0 +1,10 @@
+
+include("../OS-detect.pri")
+
+TEMPLATE = subdirs
+CONFIG += recursive
+
+SUBDIRS+= lumina-config \
+	 lumina-search \
+	 lumina-xconfig
+

lumina-config/lumina-config.pro → src-qt5/core-utils/lumina-config/lumina-config.pro

@@ -1,4 +1,4 @@
-include("$${PWD}/../OS-detect.pri")
+include("$${PWD}/../../OS-detect.pri")
 
 QT       += core gui
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network
@@ -113,4 +113,4 @@ INSTALLS += target dotrans
 
 NO_I18N{
   INSTALLS -= dotrans
-}
+}

lumina-search/lumina-search.pro → src-qt5/core-utils/lumina-search/lumina-search.pro

@@ -1,4 +1,4 @@
-include("$${PWD}/../OS-detect.pri")
+include("$${PWD}/../../OS-detect.pri")
 
 QT       += core gui
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
@@ -99,4 +99,4 @@ INSTALLS += target dotrans desktop
 
 NO_I18N{
   INSTALLS -= dotrans
-}
+}

lumina-xconfig/lumina-xconfig.pro → src-qt5/core-utils/lumina-xconfig/lumina-xconfig.pro

@@ -1,4 +1,4 @@
-include("$${PWD}/../OS-detect.pri")
+include("$${PWD}/../../OS-detect.pri")
 
 QT       += core gui
 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets network

src-qt5/core/core.pro

@@ -0,0 +1,18 @@
+
+include("../OS-detect.pri")
+
+TEMPLATE = subdirs
+CONFIG += recursive
+
+SUBDIRS+= libLumina \
+	 lumina-desktop \
+	 lumina-open \
+	 lumina-info
+#	lumina-wm-INCOMPLETE \
+#	lumina-checkpass
+
+
+#Make sure to list libLumina as a requirement for the others (for parallellized builds)
+lumina-desktop.depends = libLumina
+lumina-open.depends = libLumina
+lumina-info.depends = libLumina

libLumina/libLumina.pro → src-qt5/core/libLumina/libLumina.pro

@@ -1,4 +1,4 @@
-include("$${PWD}/../OS-detect.pri")
+include("$${PWD}/../../OS-detect.pri")
 
 QT       += core network widgets x11extras multimedia concurrent svg
 

lumina-checkpass/lumina-checkpass.pro → src-qt5/core/lumina-checkpass/lumina-checkpass.pro

@@ -1,4 +1,4 @@
-include("$${PWD}/../OS-detect.pri")
+include("$${PWD}/../../OS-detect.pri")
 
 TEMPLATE = app
 #Don't need any Qt - just a simple C program
@@ -16,4 +16,3 @@ perms.path = $$DESTDIR$${PREFIX}/sbin
 perms.extra = "chmod 4555 $$DESTDIR$${PREFIX}/sbin/lumina-checkpass"
 
 INSTALLS += target perms
-