Diff
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14512 => 14513)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-13 22:28:22 UTC (rev 14512)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp 2009-08-14 01:27:44 UTC (rev 14513)
@@ -122,26 +122,8 @@
{
pluginsDir = new QDir;
QSettings settings;
- QString dir = settings.value("PluginDir").toString();
- if (dir.isEmpty())
- {
- pluginsDir->setCurrent(qApp->applicationDirPath());
-#if defined(Q_OS_WIN)
- if (pluginsDir->dirName().toLower() == "debug" || pluginsDir->dirName().toLower() == "release")
- pluginsDir->cdUp();
-#elif defined(Q_OS_MAC)
- if (pluginsDir->dirName() == "MacOS") {
- pluginsDir->cdUp();
- pluginsDir->cdUp();
- pluginsDir->cdUp();
- }
-#endif
- pluginsDir->cd("plugins");
- }
- else
- {
- pluginsDir->setCurrent(dir);
- }
+ QString dir = settings.value("PluginDir", FSGUI_PLUGINDIR).toString();
+ pluginsDir->setCurrent(dir);
pluginConfigPage->linePluginDir->setText(pluginsDir->absolutePath());
}
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro (14512 => 14513)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-13 22:28:22 UTC (rev 14512)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro 2009-08-14 01:27:44 UTC (rev 14513)
@@ -1,20 +1,45 @@
+######################################
# version check qt
+######################################
contains(QT_VERSION, ^4\.[0-4]\..*) {
message("Cannot build FsGui with Qt version $$QT_VERSION.")
error("Use at least Qt 4.5.")
}
-QT += network
-TARGET = ../../bin/fsgui
-TEMPLATE = app
+######################################
+
+#####################################
+# Generates the version of FsGui
+# based on SVN Revision
+#####################################
+SVN_REV = $$system(svnversion -n .)
+isEmpty ( SVN_REV ) {
+SVN_REV = \\"Unknown or SVN not present\\"
+}
+DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+######################################
+
+#####################################
+# Let user change the plugin location
+# upon compilation
+#####################################
+isEmpty ( PLUGINDIR ) {
+ PLUGINDIR = $${PWD}/../../bin/plugins
+}
+DEFINES += FSGUI_PLUGINDIR='\\"$${PLUGINDIR}\\"'
+######################################
+
+QT += network
+TARGET = fsgui
+DESTDIR = ../../bin/
+TEMPLATE = app
INCLUDEPATH = ../interfaces \
- ../../../../../libs/esl/src/include/
-DEFINES += 'FSGUI_SVN_VERSION=\\"$(shell svnversion -n .)\\"'
-SOURCES += main.cpp \
- appmanager.cpp
-HEADERS += appmanager.h
-LIBS += -L../interfaces \
- -linterfaces \
- -L../../../../../libs/esl/ \
- -lesl
-FORMS += config_plugin_widget.ui
-RESOURCES += ../resources/resources.qrc
+ ../../../../../libs/esl/src/include/
+SOURCES += main.cpp \
+ appmanager.cpp
+HEADERS += appmanager.h
+LIBS += -L../interfaces \
+ -linterfaces \
+ -L../../../../../libs/esl/ \
+ -lesl
+FORMS += config_plugin_widget.ui
+RESOURCES += ../resources/resources.qrc
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro (14512 => 14513)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro 2009-08-13 22:28:22 UTC (rev 14512)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro 2009-08-14 01:27:44 UTC (rev 14513)
@@ -1,5 +1,35 @@
+######################################
+# version check qt
+######################################
+contains(QT_VERSION, ^4\.[0-4]\..*) {
+ message("Cannot build FsGui with Qt version $$QT_VERSION.")
+ error("Use at least Qt 4.5.")
+}
+######################################
+
+#####################################
+# Generates the version of FsGui
+# based on SVN Revision
+#####################################
+SVN_REV = $$system(svnversion -n .)
+isEmpty ( SVN_REV ) {
+ SVN_REV = \\"Unknown or SVN not present\\"
+}
+DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+######################################
+
+#####################################
+# ESL must be compiled
+#####################################
+!exists ( ../../../../../libs/esl/libesl.a ) {
+ error("lib esl must be compiled before FsGui")
+}
+#####################################
+
+
TEMPLATE = lib
CONFIG += staticlib
+VERSION = 0.1
INCLUDEPATH = ../fsgui/ \
../../../../../libs/esl/src/include/
HEADERS = interfaces.h \
Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro (14512 => 14513)
--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-13 22:28:22 UTC (rev 14512)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro 2009-08-14 01:27:44 UTC (rev 14513)
@@ -1,20 +1,41 @@
-TEMPLATE = lib
-TARGET = ../../../bin/plugins/consoleplugin
-CONFIG += plugin
+######################################
+# version check qt
+######################################
+contains(QT_VERSION, ^4\.[0-4]\..*) {
+ message("Cannot build FsGui with Qt version $$QT_VERSION.")
+ error("Use at least Qt 4.5.")
+}
+######################################
+
+#####################################
+# Generates the version of FsGui
+# based on SVN Revision
+#####################################
+SVN_REV = $$system(svnversion -n .)
+isEmpty ( SVN_REV ) {
+SVN_REV = \\"Unknown or SVN not present\\"
+}
+DEFINES += 'FSGUI_SVN_VERSION=\\"$$SVN_REV\\"'
+######################################
+
+TEMPLATE = lib
+TARGET = consoleplugin
+DESTDIR = ../../../bin/plugins/
+CONFIG += plugin
INCLUDEPATH = ../../fsgui/ \
- ../../interfaces \
- ../../../../../../libs/esl/src/include/
-HEADERS = consoleplugin.h \
- sortfilterproxymodel.h \
- consoletabwidget.h
-SOURCES = consoleplugin.cpp \
- sortfilterproxymodel.cpp \
- consoletabwidget.cpp
-FORMS += centralWidget.ui \
- console_settings.ui \
- consoletabwidget.ui
-LIBS += -L../../interfaces \
- -linterfaces \
- -L../../../../../../libs/esl/ \
- -lesl
+ ../../interfaces \
+ ../../../../../../libs/esl/src/include/
+HEADERS = consoleplugin.h \
+ sortfilterproxymodel.h \
+ consoletabwidget.h
+SOURCES = consoleplugin.cpp \
+ sortfilterproxymodel.cpp \
+ consoletabwidget.cpp
+FORMS += centralWidget.ui \
+ console_settings.ui \
+ consoletabwidget.ui
+LIBS += -L../../interfaces \
+ -linterfaces \
+ -L../../../../../../libs/esl/ \
+ -lesl
RESOURCES += ../../resources/resources.qrc