[PC-BSD Commits] r7216 - in pcbsd/current/lifePreserver: . scripts
svn at pcbsd.org
svn at pcbsd.org
Wed Jul 14 12:11:28 PDT 2010
Author: kris
Date: 2010-07-14 12:11:28 -0700 (Wed, 14 Jul 2010)
New Revision: 7216
Modified:
pcbsd/current/lifePreserver/externals.h
pcbsd/current/lifePreserver/lPreserve.pro
pcbsd/current/lifePreserver/lifePreserverMain.cpp
pcbsd/current/lifePreserver/lifePreserverMain.h
pcbsd/current/lifePreserver/lifepreserver.desktop
pcbsd/current/lifePreserver/main.cpp
pcbsd/current/lifePreserver/scripts/backup-rsync.sh
pcbsd/current/lifePreserver/scripts/kill-backup.sh
pcbsd/current/lifePreserver/scripts/list-backup-rsync.sh
pcbsd/current/lifePreserver/scripts/restore-rsync.sh
pcbsd/current/lifePreserver/scripts/start-backup.sh
Log:
Update lifePreserver to drop KDE4 libs, go to 100% qt4 only, and switch to /usr/local PREFIX
Modified: pcbsd/current/lifePreserver/externals.h
===================================================================
--- pcbsd/current/lifePreserver/externals.h 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/externals.h 2010-07-14 19:11:28 UTC (rev 7216)
@@ -1,2 +1,2 @@
-#define LIFEPRESERVERPATH QString("/usr/PCBSD/lifePreserver")
+#define LIFEPRESERVERPATH QString("/usr/local/share/lifePreserver")
#define LIFEPRESERVERSDIR LIFEPRESERVERPATH + QString("/preservers")
Modified: pcbsd/current/lifePreserver/lPreserve.pro
===================================================================
--- pcbsd/current/lifePreserver/lPreserve.pro 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/lPreserve.pro 2010-07-14 19:11:28 UTC (rev 7216)
@@ -3,8 +3,6 @@
CONFIG += qt warn_on release
-LIBS += -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
-
HEADERS += lifePreserverMain.h \
lifePreserverWizard.h \
lifePreserverSettings.h \
@@ -34,15 +32,11 @@
lifePreserverUserExclude.ui \
lifePreserverListBackups.ui
-#DESTDIR = /usr/local/kde4/bin
-
TRANSLATIONS = LifePreserver_en_US.ts
-INCLUDEPATH += /usr/PCBSD/includes /usr/local/kde4/include
+TARGET=/usr/local/bin/life-preserver
-TARGET=/usr/PCBSD/lifePreserver/bin/life-preserver
-
-scripts.path=/usr/PCBSD/lifePreserver/scripts
+scripts.path=/usr/local/share/lifePreserver/scripts
scripts.files=scripts/setup-ssh-keys.sh \
scripts/start-backup.sh \
scripts/functions.sh \
@@ -51,20 +45,20 @@
scripts/list-backup-rsync.sh \
scripts/kill-backup.sh
-images.path=/usr/PCBSD/lifePreserver/images/
+images.path=/usr/local/share/lifePreserver/images/
images.files=images/lifepreserver.png
-conf.path=/usr/PCBSD/lifePreserver/conf
+conf.path=/usr/local/share/lifePreserver/conf
conf.files=conf/*
-desktop.path=/usr/local/kde4/share/applications/kde4
+desktop.path=/usr/local/share/applications
desktop.files=lifepreserver.desktop
-desktopperm.path=/usr/local/kde4/share/applications/kde4/
-desktopperm.extra=chmod 644 /usr/local/kde4/share/applications/kde4/lifepreserver.desktop
+desktopperm.path=/usr/local/share/applications/kde4/
+desktopperm.extra=chmod 644 /usr/local/share/applications/lifepreserver.desktop
-dotrans.path=/usr/PCBSD/lifePreserver/i18n/
-dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/PCBSD/lifePreserver/i18n/
+dotrans.path=/usr/local/share/lifePreserver/i18n/
+dotrans.extra=cd i18n && lrelease-qt4 *.ts && cp *.qm /usr/local/share/lifePreserver/i18n/
INSTALLS += scripts conf dotrans images desktop desktopperm
@@ -132,4 +126,4 @@
i18n/LifePreserver_zh_TW.ts \
i18n/LifePreserver_zu.ts
-QMAKE_LIBDIR = /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
+QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib
Modified: pcbsd/current/lifePreserver/lifePreserverMain.cpp
===================================================================
--- pcbsd/current/lifePreserver/lifePreserverMain.cpp 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/lifePreserverMain.cpp 2010-07-14 19:11:28 UTC (rev 7216)
@@ -32,7 +32,7 @@
#include <QTimer>
#include <QMenu>
-#include <kmenu.h>
+#include <qmenu.h>
/* Local includes */
#include "ui_lifePreserverMain.h"
@@ -46,9 +46,6 @@
#include "preserver.h"
#include "externals.h"
-/* KDE */
-
-
void lifePreserver::ProgramInit()
{
qDebug("Application starting...");
Modified: pcbsd/current/lifePreserver/lifePreserverMain.h
===================================================================
--- pcbsd/current/lifePreserver/lifePreserverMain.h 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/lifePreserverMain.h 2010-07-14 19:11:28 UTC (rev 7216)
@@ -15,8 +15,7 @@
#include "ui_lifePreserverListBackups.h"
#include "lifePreserverListBackups.h"
-/* KDE */
-#include <kmenu.h>
+#include <qmenu.h>
class lifePreserver : public QMainWindow, private Ui::lifePreserver
{
Modified: pcbsd/current/lifePreserver/lifepreserver.desktop
===================================================================
--- pcbsd/current/lifePreserver/lifepreserver.desktop 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/lifepreserver.desktop 2010-07-14 19:11:28 UTC (rev 7216)
@@ -2,11 +2,11 @@
Comment[en_US]=Backup and Restore your system
Comment[ja]=システムのバックアップとレストアを行います
Comment=Backup and Restore your system
-Exec=/PCBSD/lifePreserver/bin/life-preserver
+Exec=/usr/local/bin/life-preserver
GenericName[en_US]=Life Preserver Backup
GenericName[ja]=バックアップ管理プログラム
GenericName=Life Preserver Backup
-Icon=/PCBSD/lifePreserver/images/lifepreserver.png
+Icon=/usr/local/share/lifePreserver/images/lifepreserver.png
MimeType=
Name[en_US]=Life Preserver
Name[ja]=Life Preserver
Modified: pcbsd/current/lifePreserver/main.cpp
===================================================================
--- pcbsd/current/lifePreserver/main.cpp 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/main.cpp 2010-07-14 19:11:28 UTC (rev 7216)
@@ -1,40 +1,19 @@
-#include <kapplication.h>
-#include <kaboutdata.h>
-#include <kcmdlineargs.h>
#include <qtranslator.h>
#include <qlocale.h>
#include <QDebug>
#include "preserver.h"
#include "lifePreserverMain.h"
-static const char description[] = I18N_NOOP("PC-BSD Life Preserver");
-
int main( int argc, char ** argv )
{
- KAboutData aboutData("SoftwareManager", 0, ki18n("LifePreserver"),
- "0.9", ki18n(description),
- KAboutData::License_BSD,
- ki18n("(c) 2009, Kris Moore(c)"));
+ QApplication a(argc, argv);
- aboutData.addAuthor(ki18n("Kris Moore"), ki18n("Current maintainer"), "kris at pcbsd.org");
-
- KCmdLineArgs::init(argc, argv, &aboutData);
-
- KCmdLineOptions options;
-
-
- // Tell which options are supported
- KCmdLineArgs::addCmdLineOptions( options );
-
-
- KApplication a;
-
QTranslator translator;
QLocale mylocale;
QString langCode = mylocale.name();
- if ( ! QFile::exists("/usr/PCBSD/lifePreserver/i18n/LifePreserver_" + langCode + ".qm" ) )
+ if ( ! QFile::exists("/usr/local/share/lifePreserver/i18n/LifePreserver_" + langCode + ".qm" ) )
langCode.truncate(langCode.indexOf("_"));
- translator.load( QString("LifePreserver_") + langCode, "/usr/PCBSD/lifePreserver/i18n/" );
+ translator.load( QString("LifePreserver_") + langCode, "/usr/local/share/lifePreserver/i18n/" );
a.installTranslator( &translator );
qDebug() << "Locale:" << langCode;
Modified: pcbsd/current/lifePreserver/scripts/backup-rsync.sh
===================================================================
--- pcbsd/current/lifePreserver/scripts/backup-rsync.sh 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/scripts/backup-rsync.sh 2010-07-14 19:11:28 UTC (rev 7216)
@@ -10,10 +10,10 @@
fi
DATE=`date "+%Y-%m-%dT%H_%M_%S"`
-PROGDIR="/PCBSD/lifePreserver"
+PROGDIR="/usr/local/share/lifePreserver"
HOSTDIR="${PROGDIR}/preservers/${SSHHOST}"
BACKLOG="${HOSTDIR}/logs/${DATE}.log"
-EXCLUDELIST="/PCBSD/lifePreserver/conf/rsync-excludes"
+EXCLUDELIST="/usr/local/share/lifePreserver/conf/rsync-excludes"
USEREXCLUDELIST="${HOSTDIR}/exclude-list"
TMPEXCLUDELIST="${HOSTDIR}/.working-exclude-list"
PIDFILE="${HOSTDIR}/preserver.pid"
Modified: pcbsd/current/lifePreserver/scripts/kill-backup.sh
===================================================================
--- pcbsd/current/lifePreserver/scripts/kill-backup.sh 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/scripts/kill-backup.sh 2010-07-14 19:11:28 UTC (rev 7216)
@@ -9,7 +9,7 @@
exit 150
fi
-PROGDIR="/PCBSD/lifePreserver"
+PROGDIR="/usr/local/share/lifePreserver"
PDIR="${PROGDIR}/preservers/${PRESERVER}"
SETTINGS="${PDIR}/settings.conf"
Modified: pcbsd/current/lifePreserver/scripts/list-backup-rsync.sh
===================================================================
--- pcbsd/current/lifePreserver/scripts/list-backup-rsync.sh 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/scripts/list-backup-rsync.sh 2010-07-14 19:11:28 UTC (rev 7216)
@@ -9,7 +9,7 @@
exit 150
fi
-PROGDIR="/PCBSD/lifePreserver"
+PROGDIR="/usr/local/share/lifePreserver"
HOSTDIR="${PROGDIR}/preservers/${SSHHOST}"
PIDFILE="${HOSTDIR}/preserver.pid"
SETTINGS="${HOSTDIR}/settings.conf"
Modified: pcbsd/current/lifePreserver/scripts/restore-rsync.sh
===================================================================
--- pcbsd/current/lifePreserver/scripts/restore-rsync.sh 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/scripts/restore-rsync.sh 2010-07-14 19:11:28 UTC (rev 7216)
@@ -16,7 +16,7 @@
RELKEEPPATH="${5}"
-PROGDIR="/PCBSD/lifePreserver"
+PROGDIR="/usr/local/share/lifePreserver"
HOSTDIR="${PROGDIR}/preservers/${SSHHOST}"
SETTINGS="${HOSTDIR}/settings.conf"
RESTORESH="${HOSTDIR}/.restoreCMD.$$"
Modified: pcbsd/current/lifePreserver/scripts/start-backup.sh
===================================================================
--- pcbsd/current/lifePreserver/scripts/start-backup.sh 2010-07-14 18:59:56 UTC (rev 7215)
+++ pcbsd/current/lifePreserver/scripts/start-backup.sh 2010-07-14 19:11:28 UTC (rev 7216)
@@ -12,7 +12,7 @@
exit 150
fi
-PROGDIR="/PCBSD/lifePreserver"
+PROGDIR="/usr/local/share/lifePreserver"
PDIR="${PROGDIR}/preservers/${PRESERVER}"
SETTINGS="${PDIR}/settings.conf"
More information about the Commits
mailing list