diff --git a/README.md b/README.md index e71a931..f0f748c 100644 --- a/README.md +++ b/README.md @@ -49,16 +49,20 @@ Installation sudo make install Available cmake flags: - - * `-DBUILD_DATAENGINE:BOOL=0` - do not build DataEngine - * `-DBUILD_DOCS:BOOL=0` - do not build developer documentation - * `-DBUILD_GUI:BOOL=0` - do not build GUI - * `-DBUILD_HELPER:BOOL=0` - do not build helper daemon - * `-DBUILD_LIBRARY:BOOL=0` - do not build library - * `-DBUILD_PLASMOID:BOOL=0` - do not build Plasmoid - * `-DBUILD_TEST:BOOL=1` - build auto tests for the library and the helper - * `-DUSE_CAPABILITIES` - use setcap to get privileges to the helper - * `-DUSE_QT5:BOOL=0` - use Qt4 instead of Qt5 for GUI + * components: + * `-DBUILD_DATAENGINE:BOOL=0` - do not build DataEngine + * `-DBUILD_GUI:BOOL=0` - do not build GUI + * `-DBUILD_HELPER:BOOL=0` - do not build helper daemon + * `-DBUILD_LIBRARY:BOOL=0` - do not build library + * `-DBUILD_PLASMOID:BOOL=0` - do not build Plasmoid + * additional components + * `-DBUILD_DOCS:BOOL=0` - do not build developer documentation + * `-DBUILD_TEST:BOOL=1` - build auto tests for the library and the helper + * project properties + * `-DDBUS_SYSTEMCONF_PATH=/etc/dbus-1/system.d/` - path to dbus system configuration files + * `-DSYSTEMD_SERVICE_PATH=lib/systemd/system` - path to systemd services + * `-DUSE_CAPABILITIES` - use setcap to get privileges to the helper + * `-DUSE_QT5:BOOL=0` - use Qt4 instead of Qt5 for GUI Additional information ====================== diff --git a/arch/PKGBUILD b/arch/PKGBUILD index 674797f..260be32 100644 --- a/arch/PKGBUILD +++ b/arch/PKGBUILD @@ -12,7 +12,7 @@ url="http://arcanis.name/projects/netctl-gui" license=('GPL3') makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools') source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz") -md5sums=('3151580dc48fe7f887a2656ce7a6aa1e') +md5sums=('e13006142434d84a473ffc06272f1a7d') prepare() { diff --git a/create_archive.sh b/create_archive.sh index 9a4c24a..9660d67 100755 --- a/create_archive.sh +++ b/create_archive.sh @@ -14,12 +14,12 @@ cp -r "${SRCDIR}" "${ARCHIVE}" for FILE in ${FILES[*]}; do cp -r "$FILE" "${ARCHIVE}"; done for FILE in ${IGNORELIST[*]}; do find "${ARCHIVE}" -name "${FILE}" -exec rm -rf {} \;; done tar cJf "${ARCHIVE}-${VERSION}-src.tar.xz" "${ARCHIVE}" -ln -sf "${ARCHIVE}-${VERSION}-src.tar.xz" arch +ln -sf "../${ARCHIVE}-${VERSION}-src.tar.xz" arch rm -rf "${ARCHIVE}" # update md5sum MD5SUMS=$(md5sum ${ARCHIVE}-${VERSION}-src.tar.xz | awk '{print $1}') sed -i "/md5sums=('[0-9A-Fa-f]*/s/[^'][^)]*/md5sums=('${MD5SUMS}'/" arch/PKGBUILD sed -i "s/pkgver=[0-9.]*/pkgver=${VERSION}/" arch/PKGBUILD # clear -find . -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \; -find arch -type l -xtype l +find . -type f -name '*src.tar.xz' -not -name "*${VERSION}-src.tar.xz" -exec rm -rf {} \; +find arch -type l -xtype l -exec rm -rf {} \; diff --git a/sources/gui/src/messages.cpp b/sources/gui/src/messages.cpp index fcb5d3e..73634bf 100644 --- a/sources/gui/src/messages.cpp +++ b/sources/gui/src/messages.cpp @@ -117,19 +117,33 @@ QString infoMessage() { QString infoMessage = QString(""); // build information - infoMessage += QCoreApplication::translate("MainWindow", "Build date: %1"). + infoMessage += QApplication::translate("MainWindow", "Build date: %1"). arg(QString(BUILD_DATE)); - infoMessage += QString("\n%1:\n").arg(QCoreApplication::translate("MainWindow", "cmake flags")); - infoMessage += QString("\t-DCMAKE_BUILD_TYPE=%1 \\\n").arg(QString(CMAKE_BUILD_TYPE)); - infoMessage += QString("\t-DCMAKE_INSTALL_PREFIX=%1 \\\n").arg(QString(CMAKE_INSTALL_PREFIX)); - infoMessage += QString("\t-DBUILD_DOCS=%1 \\\n").arg(QString(PROJECT_BUILD_DOCS)); - infoMessage += QString("\t-DBUILD_LIBRARY=%1 \\\n").arg(QString(PROJECT_BUILD_LIBRARY)); - infoMessage += QString("\t-DBUILD_GUI=%1 \\\n").arg(QString(PROJECT_BUILD_GUI)); - infoMessage += QString("\t-DUSE_QT5=%1 \\\n").arg(QString(PROJECT_USE_QT5)); - infoMessage += QString("\t-DBUILD_DATAENGINE=%1 \\\n").arg(QString(PROJECT_BUILD_DATAENGINE)); + // cmake + infoMessage += QString("\n%1:\n").arg(QApplication::translate("MainWindow", "cmake flags")); + // cmake properties + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "cmake properties")); + infoMessage += QString("\t-DCMAKE_BUILD_TYPE=%1\n").arg(QString(CMAKE_BUILD_TYPE)); + infoMessage += QString("\t-DCMAKE_INSTALL_PREFIX=%1\n").arg(QString(CMAKE_INSTALL_PREFIX)); + // components + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "Components")); + infoMessage += QString("\t-DBUILD_DATAENGINE=%1\n").arg(QString(PROJECT_BUILD_DATAENGINE)); + infoMessage += QString("\t-DBUILD_GUI=%1\n").arg(QString(PROJECT_BUILD_GUI)); + infoMessage += QString("\t-DBUILD_HELPER=%1\n").arg(QString(PROJECT_BUILD_HELPER)); + infoMessage += QString("\t-DBUILD_LIBRARY=%1\n").arg(QString(PROJECT_BUILD_LIBRARY)); infoMessage += QString("\t-DBUILD_PLASMOID=%1\n").arg(QString(PROJECT_BUILD_PLASMOID)); + // additional components + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "Additional components")); + infoMessage += QString("\t-DBUILD_DOCS=%1\n").arg(QString(PROJECT_BUILD_DOCS)); + infoMessage += QString("\t-DBUILD_TEST=%1\n").arg(QString(PROJECT_BUILD_TEST)); + // project properties + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "Project properties")); + infoMessage += QString("\t-DDBUS_SYSTEMCONF_PATH=%1\n").arg(QString(PROJECT_DBUS_SYSTEMCONF_PATH)); + infoMessage += QString("\t-DSYSTEMD_SERVICE_PATH=%1\n").arg(QString(PROJECT_SYSTEMD_SERVICE_PATH)); + infoMessage += QString("\t-DUSE_CAPABILITIES=%1\n").arg(QString(PROJECT_USE_CAPABILITIES)); + infoMessage += QString("\t-DUSE_QT5=%1\n").arg(QString(PROJECT_USE_QT5)); // transport information - infoMessage += QString("%1:\n").arg(QCoreApplication::translate("MainWindow", "DBus configuration")); + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "DBus configuration")); infoMessage += QString("\tDBUS_SERVICE=%1\n").arg(QString(DBUS_SERVICE)); infoMessage += QString("\tDBUS_INTERFACE=%1\n").arg(QString(DBUS_INTERFACE)); infoMessage += QString("\tDBUS_OBJECT_PATH=%1\n").arg(QString(DBUS_OBJECT_PATH)); @@ -138,11 +152,8 @@ QString infoMessage() infoMessage += QString("\tDBUS_CTRL_PATH=%1\n").arg(QString(DBUS_CTRL_PATH)); infoMessage += QString("\tDBUS_LIB_PATH=%1\n").arg(QString(DBUS_LIB_PATH)); // docs path - infoMessage += QString("%1:\n").arg(QCoreApplication::translate("MainWindow", "Documentation")); + infoMessage += QString("%1:\n").arg(QApplication::translate("MainWindow", "Documentation")); infoMessage += QString("\tDOCS_PATH=%1\n").arg(QString(DOCS_PATH)); - QStringList docs = QDir(QString(DOCS_PATH)).entryList(QDir::NoDotAndDotDot); - for (int i=0; i