<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14513] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14513">14513</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-13 20:27:44 -0500 (Thu, 13 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Finally now we are able to get SVN Revision on about and plugindir set on compile time</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcfsguifsguipro">freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcinterfacesinterfacespro">freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginpro">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguiappmanagercpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/appmanager.cpp (14512 => 14513)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -122,26 +122,8 @@
</span><span class="cx"> {
</span><span class="cx"> pluginsDir = new QDir;
</span><span class="cx"> QSettings settings;
</span><del>- 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);
- }
</del><ins>+ QString dir = settings.value("PluginDir", FSGUI_PLUGINDIR).toString();
+ pluginsDir->setCurrent(dir);
</ins><span class="cx"> pluginConfigPage->linePluginDir->setText(pluginsDir->absolutePath());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcfsguifsguipro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/fsgui/fsgui.pro (14512 => 14513)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +1,45 @@
</span><ins>+######################################
</ins><span class="cx"> # version check qt
</span><ins>+######################################
</ins><span class="cx"> contains(QT_VERSION, ^4\.[0-4]\..*) {
</span><span class="cx"> message("Cannot build FsGui with Qt version $$QT_VERSION.")
</span><span class="cx"> error("Use at least Qt 4.5.")
</span><span class="cx"> }
</span><del>-QT += network
-TARGET = ../../bin/fsgui
-TEMPLATE = app
</del><ins>+######################################
+
+#####################################
+# 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
</ins><span class="cx"> INCLUDEPATH = ../interfaces \
</span><del>- ../../../../../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
</del><ins>+ ../../../../../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
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcinterfacesinterfacespro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/interfaces/interfaces.pro (14512 => 14513)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><ins>+######################################
+# 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")
+}
+#####################################
+
+
</ins><span class="cx"> TEMPLATE = lib
</span><span class="cx"> CONFIG += staticlib
</span><ins>+VERSION = 0.1
</ins><span class="cx"> INCLUDEPATH = ../fsgui/ \
</span><span class="cx"> ../../../../../libs/esl/src/include/
</span><span class="cx"> HEADERS = interfaces.h \
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginpro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.pro (14512 => 14513)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,20 +1,41 @@
</span><del>-TEMPLATE = lib
-TARGET = ../../../bin/plugins/consoleplugin
-CONFIG += plugin
</del><ins>+######################################
+# 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
</ins><span class="cx"> INCLUDEPATH = ../../fsgui/ \
</span><del>- ../../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
</del><ins>+ ../../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
</ins><span class="cx"> RESOURCES += ../../resources/resources.qrc
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>