[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r4032: Vidalia builds on Windows now. For plugins to work it needs (in vidalia/branches/extension-api/src: . common plugins plugins/HerdictWebReporterPlugin vidalia vidalia/config)
Author: tyree731
Date: 2009-08-13 00:37:11 -0400 (Thu, 13 Aug 2009)
New Revision: 4032
Modified:
vidalia/branches/extension-api/src/CMakeLists.txt
vidalia/branches/extension-api/src/common/CMakeLists.txt
vidalia/branches/extension-api/src/plugins/CMakeLists.txt
vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.cpp
vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/qjson_export.h
vidalia/branches/extension-api/src/plugins/PluginManager.cpp
vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp
vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp
Log:
Vidalia builds on Windows now. For plugins to work it needs to load Vidalia needs to be built in release mode. Need to add install targets for libvidaliaplugin.dll and libtorcontrol.dll on Windows.
Modified: vidalia/branches/extension-api/src/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/CMakeLists.txt 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/CMakeLists.txt 2009-08-13 04:37:11 UTC (rev 4032)
@@ -18,6 +18,7 @@
${CMAKE_CURRENT_SOURCE_DIR}/common
)
link_directories(
+ ${CMAKE_CURRENT_BINARY_DIR}/plugins
${CMAKE_CURRENT_BINARY_DIR}/torcontrol
${CMAKE_CURRENT_BINARY_DIR}/common
)
Modified: vidalia/branches/extension-api/src/common/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/common/CMakeLists.txt 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/common/CMakeLists.txt 2009-08-13 04:37:11 UTC (rev 4032)
@@ -37,7 +37,7 @@
endif(WIN32)
-add_library(common SHARED ${common_SRCS})
+add_library(common STATIC ${common_SRCS})
target_link_libraries(common ${QT_LIBRARIES})
if(OPENSSL_LIBRARIES)
Modified: vidalia/branches/extension-api/src/plugins/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/CMakeLists.txt 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/plugins/CMakeLists.txt 2009-08-13 04:37:11 UTC (rev 4032)
@@ -15,6 +15,14 @@
${CMAKE_CURRENT_BINARY_DIR}
)
+if (WITH_HERDICTWEB_PLUGIN)
+ add_subdirectory(HerdictWebReporterPlugin)
+endif(WITH_HERDICTWEB_PLUGIN)
+
+if (WITH_TORBROWSERBUNDLE_PLUGIN)
+ add_subdirectory(TorBrowserBundlePlugin)
+endif(WITH_TORBROWSERBUNDLE_PLUGIN)
+
add_definitions(-DVIDALIA_PLUGIN_LIBRARY=1)
set(plugin_SRCS
PluginManager.cpp
@@ -31,10 +39,3 @@
add_library(vidaliaplugin SHARED ${plugin_SRCS})
target_link_libraries(vidaliaplugin ${QT_LIBRARIES})
-if (WITH_HERDICTWEB_PLUGIN)
- add_subdirectory(HerdictWebReporterPlugin)
-endif(WITH_HERDICTWEB_PLUGIN)
-
-if (WITH_TORBROWSERBUNDLE_PLUGIN)
- add_subdirectory(TorBrowserBundlePlugin)
-endif(WITH_TORBROWSERBUNDLE_PLUGIN)
Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.cpp 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.cpp 2009-08-13 04:37:11 UTC (rev 4032)
@@ -18,7 +18,6 @@
HerdictWebReporterPlugin::HerdictWebReporterPlugin()
{
- Q_INIT_RESOURCE(HerdictWebReporterPlugin);
_herdictPanel = 0;
}
@@ -32,6 +31,7 @@
HerdictWebReporterPlugin::panel()
{
if (!_herdictPanel) {
+ Q_INIT_RESOURCE(HerdictWebReporterPlugin);
setupUI();
}
return _herdictPanel;
Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/qjson_export.h
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/qjson_export.h 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/qjson_export.h 2009-08-13 04:37:11 UTC (rev 4032)
@@ -32,4 +32,7 @@
# endif
#endif
+#undef QJSON_EXPORT
+#define QJSON_EXPORT
+
#endif
Modified: vidalia/branches/extension-api/src/plugins/PluginManager.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/PluginManager.cpp 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/plugins/PluginManager.cpp 2009-08-13 04:37:11 UTC (rev 4032)
@@ -62,7 +62,10 @@
VidaliaPluginInterface* pluginInstance =
qobject_cast<VidaliaPluginInterface*>(loader.instance());
+ qDebug() << "Found a plugin: " << fileName << "\r\n";
+
if (pluginInstance) {
+ qDebug() << "It's actually a plugin!\n";
pluginInstance->setPluginManager(this);
_pluginList.push_back(pluginInstance);
} else {
Modified: vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/plugins/VidaliaPluginInterface.cpp 2009-08-13 04:37:11 UTC (rev 4032)
@@ -31,22 +31,9 @@
VidaliaPluginInterface::settings() const
{
QString configurationName = dataDirectory();
-
-#if defined(Q_OS_WIN)
- configurationName += QString("\");
-#else
- configurationName += QString("/");
-#endif
-
- configurationName += id();
-
-#if defined(Q_OS_WIN)
- configurationName += QString("\");
-#else
- configurationName += QString("/");
-#endif
-
+ configurationName += QString("/") + id() + QString("/");
configurationName += id() + ".conf";
+
QSettings* setting = new QSettings(configurationName, QSettings::IniFormat);
return setting;
}
Modified: vidalia/branches/extension-api/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/vidalia/CMakeLists.txt 2009-08-13 04:37:11 UTC (rev 4032)
@@ -427,4 +427,3 @@
install(FILES res/128x128/tor-logo.png RENAME vidalia.png
DESTINATION share/icons/hicolor/128x128/apps)
endif(NOT WIN32 AND NOT APPLE)
-
Modified: vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp 2009-08-12 05:24:01 UTC (rev 4031)
+++ vidalia/branches/extension-api/src/vidalia/config/VidaliaSettings.cpp 2009-08-13 04:37:11 UTC (rev 4032)
@@ -243,12 +243,7 @@
VidaliaSettings::getPluginDirectory() const
{
QString defaultPluginsDirectory = Vidalia::dataDirectory();
-#if defined(Q_OS_WIN)
- defaultPluginsDirectory += "\";
-#else
- defaultPluginsDirectory += "/";
-#endif
- defaultPluginsDirectory += "plugins";
+ defaultPluginsDirectory += "/plugins";
return value(SETTING_PLUGIN_DIRECTORY, defaultPluginsDirectory).toString();
}