Merge remote-tracking branch 'origin/master' into jerry-sandbox

ext/toolchain/commands1.py

@@ -1140,12 +1140,14 @@ class InternalCommands:
 		controlFile.close()
 
 		targetBin = '%s/%s/usr/bin' % (debDir, package)
+		targetPlugin = '%s/%s/usr/lib/synergy/plugins' % (debDir, package)
 		targetShare = '%s/%s/usr/share' % (debDir, package)
 		targetApplications = "%s/applications" % targetShare
 		targetIcons = "%s/icons" % targetShare
 		targetDocs = "%s/doc/%s" % (targetShare, self.project)
 
 		os.makedirs(targetBin)
+		os.makedirs(targetPlugin)
 		os.makedirs(targetApplications)
 		os.makedirs(targetIcons)
 		os.makedirs(targetDocs)
@@ -1163,6 +1165,17 @@ class InternalCommands:
 			if err != 0:
 				raise Exception('strip failed: ' + str(err))
 
+		pluginDir = "%s/plugins" % binDir
+
+		pluginFiles = [ 'libns.so']
+		for f in pluginFiles:
+			shutil.copy("%s/%s" % (pluginDir, f), targetPlugin)
+			target = "%s/%s" % (targetPlugin, f)
+			os.chmod(target, 0o0644)
+			err = os.system("strip " + target)
+			if err != 0:
+				raise Exception('strip failed: ' + str(err))
+
 		shutil.copy("%s/synergy.desktop" % resDir, targetApplications)
 		shutil.copy("%s/synergy.ico" % resDir, targetIcons)
 

res/synergy.spec.in

@@ -20,6 +20,7 @@ source=%{_topdir}/../..
 mkdir -p %{buildroot}/%{_datarootdir}/applications
 mkdir -p %{buildroot}/%{_datarootdir}/icons
 mkdir -p %{buildroot}/%{_bindir}
+mkdir -p %{buildroot}/%{_bindir}/../lib/synergy/plugins
 
 cp $source/bin/synergy %{buildroot}%{_bindir}
 cp $source/bin/synergyc %{buildroot}%{_bindir}
@@ -28,6 +29,7 @@ cp $source/bin/synergyd %{buildroot}%{_bindir}
 cp $source/bin/syntool %{buildroot}%{_bindir}
 cp $source/res/synergy.desktop %{buildroot}%{_datarootdir}/applications
 cp $source/res/synergy.ico %{buildroot}%{_datarootdir}/icons
+cp $source/bin/plugins/* %{buildroot}%{_bindir}/../lib/synergy/plugins
 
 %files
 %defattr(755,root,root,-)
@@ -38,6 +40,7 @@ cp $source/res/synergy.ico %{buildroot}%{_datarootdir}/icons
 %{_bindir}/syntool
 %attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
 %attr(644,-,-) %{_datarootdir}/icons/synergy.ico
+%attr(644,-,-) %{_bindir}/../lib/synergy/plugins/*
 
 %changelog
 * Thu Mar 20 2014 Nick Bolton <nick@synergy-project.org>

src/gui/gui.pro

@@ -52,12 +52,14 @@ SOURCES += src/main.cpp \
     src/DataDownloader.cpp \
     src/AddClientDialog.cpp \
     src/CommandProcess.cpp \
-    src/WebClient.cpp \
     src/PluginWizardPage.cpp \
     src/PluginManager.cpp \
     src/CoreInterface.cpp \
     src/Fingerprint.cpp \
-    src/SslCertificate.cpp
+    src/SslCertificate.cpp \
+    src/FileSysClient.cpp \
+    src/Plugin.cpp \
+    src/WebClient.cpp
 HEADERS += src/MainWindow.h \
     src/AboutDialog.h \
     src/ServerConfig.h \
@@ -94,14 +96,17 @@ HEADERS += src/MainWindow.h \
     src/DataDownloader.h \
     src/AddClientDialog.h \
     src/CommandProcess.h \
-    src/WebClient.h \
     src/EditionType.h \
     src/PluginWizardPage.h \
     src/ProcessorArch.h \
     src/PluginManager.h \
     src/CoreInterface.h \
     src/Fingerprint.h \
-    src/SslCertificate.h
+    src/SslCertificate.h \
+    src/LocalFilesystemClient.h \
+    src/FileSysClient.h \
+    src/Plugin.h \
+    src/WebClient.h
 RESOURCES += res/Synergy.qrc
 RC_FILE = res/win/Synergy.rc
 macx { 

src/gui/src/CoreInterface.cpp

@@ -39,6 +39,12 @@ QString CoreInterface::getProfileDir()
 	return run(args);
 }
 
+QString CoreInterface::getInstalledDir()
+{
+	QStringList args("--get-installed-dir");
+	return run(args);
+}
+
 QString CoreInterface::getArch()
 {
 	QStringList args("--get-arch");

src/gui/src/CoreInterface.h

@@ -26,6 +26,7 @@ public:
 
 	QString getPluginDir();
 	QString getProfileDir();
+	QString getInstalledDir();
 	QString getArch();
 	QString run(const QStringList& args, const QString& input = "");
 };

src/gui/src/FileSysClient.cpp

@@ -0,0 +1,54 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2015 Synergy Si, Std.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ *
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "FileSysClient.h"
+
+#include "EditionType.h"
+#include "QUtility.h"
+
+#include <QDir>
+#include <QProcess>
+#include <QMessageBox>
+#include <QCoreApplication>
+#include <stdexcept>
+
+void FileSysClient::queryPluginList()
+{
+	try {
+		isDone(false);
+		QString extension = "*" + Plugin::getOsSpecificExt();
+		QStringList nameFilter(extension);
+
+		QString installDir(m_CoreInterface.getInstalledDir()
+							.append(QDir::separator())
+							.append(Plugin::getOsSpecificInstallerLocation()));
+
+		QString searchDirectory(installDir);
+		QDir directory(searchDirectory);
+		m_PluginList = directory.entryList(nameFilter);
+		isDone(true);
+	}
+	catch (std::exception& e)
+	{
+		isDone(true);
+		emit error(tr(	"An error occurred while trying to load the "
+						"plugin list. Please contact the help desk, and "
+						"provide the following details.\n\n%1").arg(e.what()));
+	}
+	emit queryPluginDone();
+	return;
+}

src/gui/src/FileSysClient.h

@@ -0,0 +1,63 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2015 Synergy Si, Std.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ *
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef FileSysClient_H
+#define FileSysClient_H
+
+#include <QString>
+#include <QStringList>
+#include <QObject>
+
+#include "Plugin.h"
+#include "CoreInterface.h"
+
+class QMessageBox;
+class QWidget;
+class QStringList;
+
+class FileSysClient : public QObject
+{
+	Q_OBJECT
+
+public:
+	QStringList& getPluginList() { return m_PluginList; }
+	bool isDone() { return done; }
+	int count() { return copyCount; }
+
+public slots:
+	void queryPluginList();
+
+signals:
+	void error(QString e);
+	void queryPluginDone();
+
+private:
+	void isDone(bool b) { done = b; }
+	QString request(const QString& email,
+			const QString& password,
+			QStringList& args);
+	Plugin plugin;
+	void count(int i) { copyCount = i; }
+
+private:
+	int copyCount;
+	bool done;
+	QStringList m_PluginList;
+	CoreInterface m_CoreInterface;
+};
+
+#endif // FileSysClient_H

src/gui/src/Plugin.cpp

@@ -0,0 +1,73 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2015 Synergy Si Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ *
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "Plugin.h"
+
+#include "CoreInterface.h"
+
+static const char kBaseUrl[] = "http://synergy-project.org/files";
+static const char kDefaultVersion[] = "1.1";
+static const char kWinPackagePlatform32[] = "Windows-x86";
+static const char kWinPackagePlatform64[] = "Windows-x64";
+static const char kMacPackagePlatform[] = "MacOSX%1-i386";
+static const char kLinuxPackagePlatformDeb32[] = "Linux-i686-deb";
+static const char kLinuxPackagePlatformDeb64[] = "Linux-x86_64-deb";
+static const char kLinuxPackagePlatformRpm32[] = "Linux-i686-rpm";
+static const char kLinuxPackagePlatformRpm64[] = "Linux-x86_64-rpm";
+
+#if defined(Q_OS_WIN)
+static const char kWinPluginExt[] = ".dll";
+static const char kInstallerPluginLocation[] = "Plugins";
+#elif defined(Q_OS_MAC)
+static const char kMacPluginPrefix[] = "lib";
+static const char kMacPluginExt[] = ".dylib";
+static const char kInstallerPluginLocation[] = "plugins"; // TODO: Fix for mac
+#else
+static const char kLinuxPluginPrefix[] = "lib";
+static const char kLinuxPluginExt[] = ".so";
+// /usr/bin becomes /usr/bin/../lib/syn...
+static const char kInstallerPluginLocation[] = "../lib/synergy/plugins";
+#endif
+
+QString Plugin::getOsSpecificExt()
+{
+
+#if defined(Q_OS_WIN)
+	return kWinPluginExt;
+#elif defined(Q_OS_MAC)
+	return kMacPluginExt;
+#else
+	return kLinuxPluginExt;
+#endif
+}
+
+QString Plugin::getOsSpecificName(const QString& pluginName)
+{
+	QString result = pluginName;
+#if defined(Q_OS_WIN)
+	result.append(getOsSpecificExt());
+#elif defined(Q_OS_MAC)
+	result = kMacPluginPrefix + pluginName + getOsSpecificExt();
+#else
+	result = kLinuxPluginPrefix + pluginName + getOsSpecificExt();
+#endif
+	return result;
+}
+
+QString Plugin::getOsSpecificInstallerLocation() {
+	return kInstallerPluginLocation;
+}

src/gui/src/Plugin.h

@@ -0,0 +1,53 @@
+/*
+ * synergy -- mouse and keyboard sharing utility
+ * Copyright (C) 2015 Synergy Si Ltd.
+ *
+ * This package is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * found in the file LICENSE that should have accompanied this file.
+ *
+ * This package is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#ifndef PLUGIN_H
+#define PLUGIN_H
+
+#include <QString>
+#include <QStringList>
+#include <QObject>
+
+#include "SslCertificate.h"
+#include "CoreInterface.h"
+#include "DataDownloader.h"
+
+class Plugin : public QObject
+{
+	Q_OBJECT
+
+public:
+	//Plugin();
+	//~PluginManager();
+
+	static QString getOsSpecificName(const QString& pluginName);
+	static QString getOsSpecificExt();
+	static QString getOsSpecificLocation();
+	static QString getOsSpecificInstallerLocation();
+	static QString getOsSpecificUserLocation();
+
+public slots:
+
+private:
+//	CoreInterface m_CoreInterface;
+
+signals:
+
+private:
+
+};
+
+#endif // PLUGIN_H

src/gui/src/PluginManager.cpp

@@ -23,37 +23,25 @@
 #include "QUtility.h"
 #include "ProcessorArch.h"
 #include "Fingerprint.h"
+#include "Plugin.h"
+
+#include <QTextStream>
 
 #include <QFile>
 #include <QDir>
 #include <QProcess>
 #include <QCoreApplication>
 
-static const char kBaseUrl[] = "http://synergy-project.org/files";
+PluginManager::PluginManager() :
-static const char kDefaultVersion[] = "1.1";
+	m_FileSysPluginList()
-static const char kWinPackagePlatform32[] = "Windows-x86";
-static const char kWinPackagePlatform64[] = "Windows-x64";
-static const char kMacPackagePlatform[] = "MacOSX%1-i386";
-static const char kLinuxPackagePlatformDeb32[] = "Linux-i686-deb";
-static const char kLinuxPackagePlatformDeb64[] = "Linux-x86_64-deb";
-static const char kLinuxPackagePlatformRpm32[] = "Linux-i686-rpm";
-static const char kLinuxPackagePlatformRpm64[] = "Linux-x86_64-rpm";
-
-#if defined(Q_OS_WIN)
-static const char kWinPluginExt[] = ".dll";
-
-#elif defined(Q_OS_MAC)
-static const char kMacPluginPrefix[] = "lib";
-static const char kMacPluginExt[] = ".dylib";
-#else
-static const char kLinuxPluginPrefix[] = "lib";
-static const char kLinuxPluginExt[] = ".so";
-#endif
-
-PluginManager::PluginManager(QStringList pluginList) :
-	m_PluginList(pluginList),
-	m_DownloadIndex(-1)
 {
+}
+
+void PluginManager::initFromFileSys(QStringList pluginList)
+{
+	m_FileSysPluginList.clear();
+	m_FileSysPluginList.append(pluginList);
+
 	m_PluginDir = m_CoreInterface.getPluginDir();
 	if (m_PluginDir.isEmpty()) {
 		emit error(tr("Failed to get plugin directory."));
@@ -63,6 +51,11 @@ PluginManager::PluginManager(QStringList pluginList) :
 	if (m_ProfileDir.isEmpty()) {
 		emit error(tr("Failed to get profile directory."));
 	}
+
+	m_InstalledDir = m_CoreInterface.getInstalledDir();
+	if (m_InstalledDir.isEmpty()) {
+		emit error(tr("Failed to get installed directory."));
+	}
 }
 
 PluginManager::~PluginManager()
@@ -73,7 +66,7 @@ bool PluginManager::exist(QString name)
 {
 	CoreInterface coreInterface;
 	QString PluginDir = coreInterface.getPluginDir();
-	QString pluginName = getPluginOsSpecificName(name);
+	QString pluginName = Plugin::getOsSpecificName(name);
 	QString filename;
 	filename.append(PluginDir);
 	filename.append(QDir::separator()).append(pluginName);
@@ -86,160 +79,72 @@ bool PluginManager::exist(QString name)
 	return exist;
 }
 
-void PluginManager::downloadPlugins()
+void PluginManager::copyPlugins()
 {
-	if (m_DataDownloader.isFinished()) {
-		if (!savePlugin()) {
-			return;
-		}
-
-		if (m_DownloadIndex != m_PluginList.size() - 1) {
-			emit downloadNext();
-		}
-		else {
-			emit downloadFinished();
-			return;
-		}
-	}
-
-	m_DownloadIndex++;
-
-	if (m_DownloadIndex < m_PluginList.size()) {
-		QUrl url;
-		QString pluginUrl = getPluginUrl(m_PluginList.at(m_DownloadIndex));
-		if (pluginUrl.isEmpty()) {
-			return;
-		}
-		url.setUrl(pluginUrl);
-
-		connect(&m_DataDownloader, SIGNAL(isComplete()), this, SLOT(downloadPlugins()));
-
-		m_DataDownloader.download(url);
-	}
-}
-
-bool PluginManager::savePlugin()
-{
-	// create the path if not exist
-	QDir dir(m_PluginDir);
-	if (!dir.exists()) {
-		dir.mkpath(".");
-	}
-
-	QString filename = m_PluginDir;
-	QString pluginName = m_PluginList.at(m_DownloadIndex);
-	pluginName = getPluginOsSpecificName(pluginName);
-	filename.append(QDir::separator()).append(pluginName);
-
-	QFile file(filename);
-	if (!file.open(QIODevice::WriteOnly)) {
-		emit error(
-				tr("Failed to download plugin '%1' to: %2\n%3")
-				.arg(m_PluginList.at(m_DownloadIndex))
-				.arg(m_PluginDir)
-				.arg(file.errorString()));
-
-		file.close();
-		return false;
-	}
-
-	file.write(m_DataDownloader.data());
-	file.close();
-
-	return true;
-}
-
-QString PluginManager::getPluginUrl(const QString& pluginName)
-{
-	QString archName;
-
-#if defined(Q_OS_WIN)
-
 	try {
-		QString coreArch = m_CoreInterface.getArch();
+		// Get the Directory where plugins are put on installation
-		if (coreArch.startsWith("x86")) {
+		// If it doesn't exist, there is nothing to do
-			archName = kWinPackagePlatform32;
+		QString srcDirName(m_InstalledDir.append(QDir::separator())
+							.append(Plugin::getOsSpecificInstallerLocation()));
+
+		QDir srcDir(srcDirName);
+		if (!srcDir.exists()) {
+			emit info(
+				tr("No plugins found to copy from %1")
+				.arg(srcDirName));
+			emit copyFinished();
 		}
-		else if (coreArch.startsWith("x64")) {
+
-			archName = kWinPackagePlatform64;
+		// Get the directory where Plugins are installed into Synergy
+		// If it doesn't exist make it
+		QString destDirName = m_PluginDir;
+
+		QDir destDir(destDirName);
+		if (!destDir.exists()) {
+			destDir.mkpath(".");
+		}
+		// Run through the list of plugins and copy them
+		for ( int i = 0 ; i < m_FileSysPluginList.size() ; i++ ) {
+			// Get a file entry for the plugin using the full path
+			QFile file(srcDirName + QDir::separator() + m_FileSysPluginList.at(i));
+
+			// construct the destination file name
+			QString newName(destDirName + QDir::separator() + m_FileSysPluginList.at(i));
+
+			// Check to see if the plugin already exists
+			QFile newFile(newName);
+			if(newFile.exists()) {
+				// If it does, delete it. TODO: Check to see if same and leave
+				newFile.remove();
+			}
+			// make a copy of the plugin in the new location
+			#if defined(Q_OS_WIN)
+			bool result = file.copy(newName);
+			#else
+			bool result = file.link(newName);
+			#endif
+			if ( !result ) {
+					emit error(
+							tr("Failed to copy plugin '%1' to: %2\n%3")
+							.arg(m_FileSysPluginList.at(i))
+							.arg(newName)
+							.arg(file.errorString()));
+			}
+			else {
+				emit info(
+					tr("Copying '%1' plugin (%2/%3)...")
+					.arg(m_FileSysPluginList.at(i))
+					.arg(i+1)
+					.arg(m_FileSysPluginList.size()));
+			}
 		}
 	}
-	catch (...) {
+	catch (std::exception& e)
-		emit error(tr("Could not get Windows architecture type."));
+	{
-		return "";
+		emit error(tr(	"An error occurred while trying to copy the "
+						"plugin list. Please contact the help desk, and "
+						"provide the following details.\n\n%1").arg(e.what()));
 	}
-
+	emit copyFinished();
-#elif defined(Q_OS_MAC)
+	return;
-
-	QString macVersion = "1010";
-#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090 // 10.9
-	macVersion = "109";
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED <= 1080 // 10.8
-	macVersion = "108";
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED <= 1070 // 10.7
-	emit error(tr("Plugins not supported on this Mac OS X version."));
-	return "";
-#endif
-
-	archName = QString(kMacPackagePlatform).arg(macVersion);
-
-#else
-
-	QString program("dpkg");
-	QStringList args;
-	args << "-s" << "synergy";
-
-	QProcess process;
-	process.setReadChannel(QProcess::StandardOutput);
-	process.start(program, args);
-	bool success = process.waitForStarted();
-
-	bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0));
-
-	int arch = getProcessorArch();
-	if (arch == kProcessorArchLinux32) {
-		if (isDeb) {
-			archName = kLinuxPackagePlatformDeb32;
-		}
-		else {
-			archName = kLinuxPackagePlatformRpm32;
-		}
-	}
-	else if (arch == kProcessorArchLinux64) {
-		if (isDeb) {
-			archName = kLinuxPackagePlatformDeb64;
-		}
-		else {
-			archName = kLinuxPackagePlatformRpm64;
-		}
-	}
-	else {
-		emit error(tr("Could not get Linux architecture type."));
-		return "";
-	}
-
-#endif
-
-	QString result = QString("%1/plugins/%2/%3/%4/%5")
-			.arg(kBaseUrl)
-			.arg(pluginName)
-			.arg(kDefaultVersion)
-			.arg(archName)
-			.arg(getPluginOsSpecificName(pluginName));
-
-	qDebug() << result;
-	return result;
-}
-
-QString PluginManager::getPluginOsSpecificName(const QString& pluginName)
-{
-	QString result = pluginName;
-#if defined(Q_OS_WIN)
-	result.append(kWinPluginExt);
-#elif defined(Q_OS_MAC)
-	result = kMacPluginPrefix + pluginName + kMacPluginExt;
-#else
-	result = kLinuxPluginPrefix + pluginName + kLinuxPluginExt;
-#endif
-	return result;
 }

src/gui/src/PluginManager.h

@@ -25,44 +25,46 @@
 #include "SslCertificate.h"
 #include "CoreInterface.h"
 #include "DataDownloader.h"
+#include "Plugin.h"
 
 class PluginManager : public QObject
 {
 	Q_OBJECT
 
 public:
-	PluginManager(QStringList pluginList);
+	PluginManager();
 	~PluginManager();
 
-	int downloadIndex() { return m_DownloadIndex; }
+	void initFromWeb(QStringList pluginList);
+	void initFromFileSys(QStringList pluginList);
+
+	int pluginCount() { return m_FileSysPluginList.count(); }
 
 	static bool exist(QString name);
 
 public slots:
-	void downloadPlugins();
+	void copyPlugins();
 
 private:
-	bool savePlugin();
 	QString getPluginUrl(const QString& pluginName);
 	bool runProgram(
 		const QString& program,
 		const QStringList& args,
 		const QStringList& env);
 
-	static QString getPluginOsSpecificName(const QString& pluginName);
+	//static QString getPluginOsSpecificName(const QString& pluginName);
 
 signals:
 	void error(QString e);
 	void info(QString i);
-	void downloadNext();
+	void updateCopyStatus(int);
-	void downloadFinished();
+	void copyFinished();
 
 private:
-	QStringList m_PluginList;
+	QStringList m_FileSysPluginList;
 	QString m_PluginDir;
 	QString m_ProfileDir;
-	int m_DownloadIndex;
+	QString m_InstalledDir;
-	DataDownloader m_DataDownloader;
 	CoreInterface m_CoreInterface;
 	SslCertificate m_SslCertificate;
 };

src/gui/src/PluginWizardPage.cpp

@@ -19,6 +19,7 @@
 #include "ui_PluginWizardPageBase.h"
 
 #include "SslCertificate.h"
+#include "FileSysClient.h"
 #include "WebClient.h"
 #include "PluginManager.h"
 
@@ -28,8 +29,7 @@
 PluginWizardPage::PluginWizardPage(AppConfig& appConfig, QWidget *parent) :
 	QWizardPage(parent),
 	m_Finished(false),
-	m_pWebClient(NULL),
+	m_pFileSysClient(NULL),
-	m_pPluginManager(NULL),
 	m_pSslCertificate(NULL),
 	m_AppConfig(appConfig)
 {
@@ -44,12 +44,8 @@ PluginWizardPage::PluginWizardPage(AppConfig& appConfig, QWidget *parent) :
 
 PluginWizardPage::~PluginWizardPage()
 {
-	if (m_pWebClient != NULL) {
+	if (m_pFileSysClient != NULL) {
-		delete m_pWebClient;
+		delete m_pFileSysClient;
-	}
-
-	if (m_pPluginManager != NULL) {
-		delete m_pPluginManager;
 	}
 
 	delete m_pSslCertificate;
@@ -75,27 +71,16 @@ void PluginWizardPage::showError(QString error)
 
 void PluginWizardPage::queryPluginDone()
 {
-	QStringList pluginList = m_pWebClient->getPluginList();
+	QStringList pluginList = m_pFileSysClient->getPluginList();
 	if (pluginList.isEmpty()) {
 		updateStatus(tr("Setup complete."));
 		showFinished();
 	}
 	else {
-		downloadPlugins();
+		copyPlugins();
 	}
 }
 
-void PluginWizardPage::updateDownloadStatus()
-{
-	QStringList pluginList = m_pWebClient->getPluginList();
-	int index = m_pPluginManager->downloadIndex();
-	updateStatus(
-		tr("Downloading '%1' plugin (%2/%3)...")
-		.arg(pluginList.at(index + 1))
-		.arg(index + 2)
-		.arg(pluginList.size()));
-}
-
 void PluginWizardPage::finished()
 {
 	// TODO: we should check if ns plugin exists
@@ -130,33 +115,29 @@ void PluginWizardPage::updateStatus(QString info)
 	m_pLabelStatus->setText(info);
 }
 
-void PluginWizardPage::downloadPlugins()
+void PluginWizardPage::copyPlugins()
 {
-	QStringList pluginList = m_pWebClient->getPluginList();
+	QStringList pluginList = m_pFileSysClient->getPluginList();
-	m_pPluginManager = new PluginManager(pluginList);
+	m_PluginManager.initFromFileSys(pluginList);
+
 	m_pThread = new QThread;
 
-	connect(m_pPluginManager,
+	connect(&m_PluginManager,
 		SIGNAL(error(QString)),
 		this,
 		SLOT(showError(QString)));
 
-	connect(m_pPluginManager,
+	connect(&m_PluginManager,
 		SIGNAL(info(QString)),
 		this,
 		SLOT(updateStatus(QString)));
 
-	connect(m_pPluginManager,
+	connect(&m_PluginManager,
-		SIGNAL(downloadNext()),
+		SIGNAL(copyFinished()),
-		this,
-		SLOT(updateDownloadStatus()));
-
-	connect(m_pPluginManager,
-		SIGNAL(downloadFinished()),
 		this,
 		SLOT(generateCertificate()));
 
-	connect(m_pPluginManager,
+	connect(&m_PluginManager,
 		SIGNAL(error(QString)),
 		m_pThread,
 		SLOT(quit()));
@@ -167,16 +148,14 @@ void PluginWizardPage::downloadPlugins()
 		SLOT(deleteLater()));
 
 	updateStatus(
-		tr("Downloading plugin: %1 (1/%2)")
+		tr("Copying plugins..."));
-		.arg(pluginList.at(0))
-		.arg(pluginList.size()));
 
-	m_pPluginManager->moveToThread(m_pThread);
+	m_PluginManager.moveToThread(m_pThread);
 	m_pThread->start();
 
 	QMetaObject::invokeMethod(
-		m_pPluginManager,
+		&m_PluginManager,
-		"downloadPlugins",
+		"copyPlugins",
 		Qt::QueuedConnection);
 }
 
@@ -195,7 +174,7 @@ bool PluginWizardPage::isComplete() const
 void PluginWizardPage::initializePage()
 {
 	QWizardPage::initializePage();
-	if (m_pWebClient == NULL) {
+	if (m_pFileSysClient == NULL) {
 		if (m_Email.isEmpty() ||
 			m_Password.isEmpty()) {
 			updateStatus(tr("Setup complete."));
@@ -205,38 +184,38 @@ void PluginWizardPage::initializePage()
 
 		m_pLabelSpinning->show();
 
+		m_pFileSysClient = new FileSysClient();
 		m_pWebClient = new WebClient();
 		m_pWebClient->setEmail(m_Email);
 		m_pWebClient->setPassword(m_Password);
 
 		QThread* thread = new QThread;
 
-		connect(m_pWebClient,
+		connect(m_pFileSysClient,
 			SIGNAL(error(QString)),
 			this,
 			SLOT(showError(QString)));
 
-		connect(m_pWebClient,
+		connect(m_pFileSysClient,
 			SIGNAL(queryPluginDone()),
 			this,
 			SLOT(queryPluginDone()));
 
-		connect(m_pWebClient,
+		connect(m_pFileSysClient,
 			SIGNAL(queryPluginDone()),
 			thread,
 			SLOT(quit()));
 
-		connect(m_pWebClient,
+		connect(m_pFileSysClient,
 			SIGNAL(error(QString)),
 			thread,
 			SLOT(quit()));
 
 		connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
 
-		m_pWebClient->moveToThread(thread);
+		m_pFileSysClient->moveToThread(thread);
 		thread->start();
 
-		updateStatus(tr("Getting plugin list..."));
+		QMetaObject::invokeMethod(m_pFileSysClient, "queryPluginList", Qt::QueuedConnection);
-		QMetaObject::invokeMethod(m_pWebClient, "queryPluginList", Qt::QueuedConnection);
 	}
 }

src/gui/src/PluginWizardPage.h

@@ -21,19 +21,20 @@
 #include "AppConfig.h"
 
 #include "ui_PluginWizardPageBase.h"
+#include "PluginManager.h"
 #include <QWizardPage>
 
+class FileSysClient;
 class WebClient;
-class PluginManager;
 class SslCertificate;
 
 class PluginWizardPage : public QWizardPage, public Ui::PluginWizardPage {
 
-    Q_OBJECT
+	Q_OBJECT
 
 public:
 	PluginWizardPage(AppConfig& appConfig, QWidget *parent = 0);
-    ~PluginWizardPage();
+	~PluginWizardPage();
 
 	void setFinished(bool b) { m_Finished = b; }
 	void setEmail(QString e) { m_Email = e; }
@@ -43,18 +44,17 @@ public:
 	void initializePage();
 
 protected:
-    void changeEvent(QEvent *e);
+	void changeEvent(QEvent *e);
 
 protected slots:
 	void showError(QString error);
 	void updateStatus(QString info);
 	void queryPluginDone();
-	void updateDownloadStatus();
 	void finished();
 	void generateCertificate();
 
 private:
-	void downloadPlugins();
+	void copyPlugins();
 	void showFinished();
 
 private:
@@ -62,7 +62,8 @@ private:
 	QString m_Email;
 	QString m_Password;
 	WebClient* m_pWebClient;
-	PluginManager* m_pPluginManager;
+	FileSysClient* m_pFileSysClient;
+	PluginManager m_PluginManager;
 	SslCertificate* m_pSslCertificate;
 	QThread* m_pThread;
 	AppConfig& m_AppConfig;

src/lib/arch/unix/ArchFileUnix.cpp

@@ -92,9 +92,9 @@ std::string
 ArchFileUnix::getInstalledDirectory()
 {
 #if WINAPI_XWINDOWS
-	return "/bin";
+	return "/usr/bin";
 #else
-	return "";
+	return "/Applications/Synergy.app/Contents/MacOS";
 #endif
 }
 

src/lib/arch/win32/ArchPluginWindows.cpp

@@ -69,7 +69,12 @@ ArchPluginWindows::load()
 		String filename = synergy::string::removeFileExt(*it);
 		m_pluginTable.insert(std::make_pair(filename, lib));
 
-		LOG((CLOG_DEBUG "loaded plugin: %s", (*it).c_str()));
+		char * version = (char*)invoke( filename.c_str(),"version",NULL);
+		if (version == NULL) {
+			version = "Pre-1.7.4";
+		}
+
+		LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(),version));
 	}
 }
 

src/lib/plugin/ns/ns.cpp

@@ -24,6 +24,7 @@
 
 #include <iostream>
 
+const char * kSynergyVers = VERSION;
 SecureSocket* g_secureSocket = NULL;
 SecureListenSocket* g_secureListenSocket = NULL;
 Arch* g_arch = NULL;
@@ -86,6 +87,9 @@ invoke(const char* command, void** args)
 			g_secureListenSocket = NULL;
 		}
 	}
+	else if(strcmp(command, "version") == 0) {
+		return (void*) kSynergyVers;
+	}
 
 	return NULL;
 }

src/lib/synergy/ArgParser.cpp

@@ -180,6 +180,10 @@ ArgParser::parseToolArgs(ToolArgs& args, int argc, const char* const* argv)
 			args.m_getPluginList = true;
 			return true;
 		}
+		else if (isArg(i, argc, argv, NULL, "--get-installed-dir", 0)) {
+			args.m_getInstalledDir = true;
+			return true;
+		}
 		else if (isArg(i, argc, argv, NULL, "--get-plugin-dir", 0)) {
 			args.m_getPluginDir = true;
 			return true;

src/lib/synergy/ToolApp.cpp

@@ -74,6 +74,9 @@ ToolApp::run(int argc, char** argv)
 		else if (m_args.m_getPluginList) {
 			getPluginList();
 		}
+		else if (m_args.m_getInstalledDir) {
+			std::cout << ARCH->getInstalledDirectory() << std::endl;
+		}
 		else if (m_args.m_getPluginDir) {
 			std::cout << ARCH->getPluginDirectory() << std::endl;
 		}
@@ -143,4 +146,4 @@ ToolApp::getPluginList()
 	ss << "&password=" << password;
 
 	std::cout << ARCH->internet().get(ss.str()) << std::endl;
-}
+}

src/lib/synergy/ToolArgs.cpp

@@ -22,6 +22,7 @@ ToolArgs::ToolArgs() :
 	m_loginAuthenticate(false),
 	m_getPluginList(false),
 	m_getPluginDir(false),
+	m_getInstalledDir(false),
 	m_getProfileDir(false)
 {
 }

src/lib/synergy/ToolArgs.h

@@ -28,6 +28,7 @@ public:
 	bool				m_loginAuthenticate;
 	bool				m_getPluginList;
 	bool				m_getPluginDir;
+	bool				m_getInstalledDir;
 	bool				m_getProfileDir;
 	bool				m_getArch;
 };

src/setup/win32/Product.wxs

@@ -27,6 +27,7 @@
     <Feature Id="ProductFeature" Title="$(var.Name)">
       <ComponentGroupRef Id="ProductComponents" />
       <ComponentGroupRef Id="OpenSslComponents" />
+      <ComponentGroupRef Id="PluginsComponents" />
       <MergeRef Id="CRT" />
     </Feature>
 
@@ -69,6 +70,7 @@
         <Directory Id="INSTALLFOLDER" Name="$(var.Name)">
           <Merge Id="CRT" Language="0" SourceFile="$(var.CRT)" DiskId="1" />
           <Directory Id="OpenSslDir" Name="OpenSSL" />
+          <Directory Id="PluginsDir" Name="Plugins" />
         </Directory>
       </Directory>
       <Directory Id="ProgramMenuFolder" />
@@ -130,5 +132,12 @@
         <File Source="$(var.ResPath)/openssl/synergy.conf" />
       </Component>
     </ComponentGroup>
+
+    <ComponentGroup Id="PluginsComponents" Directory="PluginsDir">
+      <Component Id="Plugins" Guid="0AB05500-0D04-4932-9B07-EDDA052796E2">
+        <File Source="$(var.BinPath)/plugins/ns.dll" />
+      </Component>
+    </ComponentGroup>
+
   </Fragment>
 </Wix>