Reduced compile times

- new commandline argument handling
- compiles on windows again

9 files changed, 441 insertions, 6 deletions

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index de7fa70..51fe962 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -68,6 +68,11 @@ if (NOT WIN32)
 	add_test(test-stress ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-stress ${CMAKE_SOURCE_DIR}/test/samples/w3c)
 	set_target_properties(test-stress PROPERTIES FOLDER "Tests")
 
+	add_executable(test-instant-messaging src/test-instant-messaging.cpp)
+	target_link_libraries(test-instant-messaging uscxml)
+	add_test(test-instant-messaging ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-instant-messaging)
+	set_target_properties(test-instant-messaging PROPERTIES FOLDER "Tests")
+
 endif()
 
 add_executable(test-url src/test-url.cpp)
@@ -75,6 +80,12 @@ target_link_libraries(test-url uscxml)
 add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-url)
 set_target_properties(test-url PROPERTIES FOLDER "Tests")
 
+
+add_executable(test-cmdline-parsing src/test-cmdline-parsing.cpp)
+target_link_libraries(test-cmdline-parsing uscxml)
+add_test(test-cmdline-parsing ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-cmdline-parsing)
+set_target_properties(test-cmdline-parsing PROPERTIES FOLDER "Tests")
+
 # add_executable(test-initial-config src/test-initial-config.cpp)
 # target_link_libraries(test-initial-config uscxml)
 # add_test(test-url ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-initial-config ${CMAKE_SOURCE_DIR}/test/samples/uscxml/test-initial-config.scxml)
diff --git a/test/samples/uscxml/test-instant-messaging.scxml b/test/samples/uscxml/test-instant-messaging.scxml
index 6ca39d4..588b2b7 100644
--- a/test/samples/uscxml/test-instant-messaging.scxml
+++ b/test/samples/uscxml/test-instant-messaging.scxml
@@ -19,18 +19,25 @@
 			<param name="username" expr="'uscxml@localhost'" />
 			<param name="password" expr="'password'" />
 			<param name="protocol" expr="'prpl-jabber'" />
+			<finalize>
+				<script>print("-----------------\n"); dump(_event);</script>
+			</finalize>
 		</invoke>
 
 		<state id="dump">
 			<transition event="dump" target="dump">
 				<send event="dump" delay="1000ms" />
 				<script>//dump(_invokers['im']);</script>
-				<send target="#_im" event="im.send">
-					<param name="receiver" expr="'sradomski@localhost'" />
-					<param name="data" expr="someBinaryData" />
-					<content>Hey There!</content>
-				</send>
 			</transition>
 		</state>
+		
+		<transition event="im.buddy.status.changed" cond="_event.data.name === 'sradomski@localhost'">
+			<send target="#_im" event="im.send">
+				<param name="receiver" expr="'sradomski@localhost'" />
+				<param name="data" expr="someBinaryData" />
+				<content>Hey There!</content>
+			</send>
+		</transition>
+
 	</state>
 </scxml>
\ No newline at end of file
diff --git a/test/samples/uscxml/test-performance.scxml b/test/samples/uscxml/test-performance.scxml
index a102a18..4d2d4c4 100644
--- a/test/samples/uscxml/test-performance.scxml
+++ b/test/samples/uscxml/test-performance.scxml
@@ -1,6 +1,6 @@
 <scxml datamodel="ecmascript">
 	<datamodel>
-		<data id="iterations">1000</data>
+		<data id="iterations">10000</data>
 	</datamodel>
 	<state id="start">
 		<transition target="loop" />
diff --git a/test/samples/uscxml/test-startup-time.scxml b/test/samples/uscxml/test-startup-time.scxml
new file mode 100644
index 0000000..cc10f04
--- /dev/null
+++ b/test/samples/uscxml/test-startup-time.scxml
@@ -0,0 +1,4 @@
+<scxml datamodel="ecmascript">
+	<script>print("asdf");</script>
+	<state id="foo" final="true" />
+</scxml>
\ No newline at end of file
diff --git a/test/src/test-arabica-events.cpp b/test/src/test-arabica-events.cpp
index 193b7ae..0cd45ee 100644
--- a/test/src/test-arabica-events.cpp
+++ b/test/src/test-arabica-events.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include "uscxml/config.h"
 #include "uscxml/Common.h"
 #include <DOM/Document.hpp>
diff --git a/test/src/test-arabica-parsing.cpp b/test/src/test-arabica-parsing.cpp
index 24c58ae..24275fc 100644
--- a/test/src/test-arabica-parsing.cpp
+++ b/test/src/test-arabica-parsing.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include "uscxml/config.h"
 #include "uscxml/Common.h"
 #include <DOM/Document.hpp>
diff --git a/test/src/test-arabica-xpath.cpp b/test/src/test-arabica-xpath.cpp
index 408cc2b..fe457f4 100644
--- a/test/src/test-arabica-xpath.cpp
+++ b/test/src/test-arabica-xpath.cpp
@@ -1,3 +1,5 @@
+#include <iostream>
+
 #include <XPath/XPath.hpp>
 #include <DOM/Simple/DOMImplementation.hpp>
 #include <DOM/io/Stream.hpp>
diff --git a/test/src/test-cmdline-parsing.cpp b/test/src/test-cmdline-parsing.cpp
new file mode 100644
index 0000000..b0b909e
--- /dev/null
+++ b/test/src/test-cmdline-parsing.cpp
@@ -0,0 +1,109 @@
+#include "uscxml/config.h"
+#include "uscxml/Interpreter.h"
+#include <glog/logging.h>
+
+int main(int argc, char** argv) {
+	using namespace uscxml;
+
+	if (true) {
+		int testArgc = 11;
+		const char* testArgv[] = {
+			"test-cmdline-parsing",
+			"--verbose",
+			"--dot",
+			"--port=80",
+			"--ssl-port=8080",
+			"--certificate=/foo/bar.pem",
+			"--private-key=/foo/bar.priv",
+			"--public-key=/foo/bar.pub",
+			"--plugin-path=/foo/plugins",
+			"--loglevel=10",
+			"--disable-http",
+			0
+		};
+		InterpreterOptions options = InterpreterOptions::fromCmdLine(testArgc, (char **)testArgv);
+		assert(options.verbose);
+		assert(options.useDot);
+		assert(options.httpPort == 80);
+		assert(options.httpsPort == 8080);
+		assert(boost::equals(options.certificate, "/foo/bar.pem"));
+		assert(boost::equals(options.privateKey, "/foo/bar.priv"));
+		assert(boost::equals(options.publicKey, "/foo/bar.pub"));
+		assert(boost::equals(options.pluginPath, "/foo/plugins"));
+		assert(options.logLevel == 10);
+		assert(!options.withHTTP);
+		assert(!options); // invalid as no SCXML document is given
+		
+		optind = 0;
+		optreset = 1;
+	}
+
+	if (true) {
+		int testArgc = 3;
+		const char* testArgv[] = {
+			"test-cmdline-parsing",
+			"--verbose",
+			"/foo/bar.scxml",
+			0
+		};
+		InterpreterOptions options = InterpreterOptions::fromCmdLine(testArgc, (char **)testArgv);
+		assert(options);
+		assert(options.verbose);
+		assert(options.interpreters.size() == 1);
+		assert(options.interpreters.find("/foo/bar.scxml") != options.interpreters.end());
+
+		optind = 0;
+		optreset = 1;
+	}
+
+	if (true) {
+		int testArgc = 7;
+		const char* testArgv[] = {
+			"test-cmdline-parsing",
+			"--port=80",
+			"/foo/bar1.scxml",
+			"--disable-http",
+			"/foo/bar2.scxml",
+			"/foo/bar3.scxml",
+			"--disable-http",
+			0
+		};
+		InterpreterOptions options = InterpreterOptions::fromCmdLine(testArgc, (char **)testArgv);
+		assert(options);
+		assert(options.httpPort == 80);
+		assert(options.interpreters.size() == 3);
+		assert(options.interpreters.find("/foo/bar1.scxml") != options.interpreters.end());
+		assert(options.interpreters.find("/foo/bar2.scxml") != options.interpreters.end());
+		assert(options.interpreters.find("/foo/bar3.scxml") != options.interpreters.end());
+		assert(!options.interpreters["/foo/bar1.scxml"]->withHTTP);
+		assert(options.interpreters["/foo/bar2.scxml"]->withHTTP);
+		assert(!options.interpreters["/foo/bar3.scxml"]->withHTTP);
+
+		optind = 0;
+		optreset = 1;
+	}
+
+	if (true) {
+		int testArgc = 5;
+		const char* testArgv[] = {
+			"test-cmdline-parsing",
+			"--port=80",
+			"/foo/bar1.scxml",
+			"--vrml-path=/foo/bar.test",
+			"--tmp-path=/foo/bar.test",
+			0
+		};
+		InterpreterOptions options = InterpreterOptions::fromCmdLine(testArgc, (char **)testArgv);
+		assert(options);
+		assert(options.httpPort == 80);
+		assert(options.interpreters.size() == 1);
+		assert(options.interpreters.find("/foo/bar1.scxml") != options.interpreters.end());
+		assert(options.interpreters["/foo/bar1.scxml"]->additionalParameters.find("vrml-path") != options.interpreters["/foo/bar1.scxml"]->additionalParameters.end());
+		assert(options.interpreters["/foo/bar1.scxml"]->additionalParameters.find("tmp-path") != options.interpreters["/foo/bar1.scxml"]->additionalParameters.end());
+		
+		optind = 0;
+		optreset = 1;
+	}
+
+	return EXIT_SUCCESS;
+}
\ No newline at end of file
diff --git a/test/src/test-instant-messaging.cpp b/test/src/test-instant-messaging.cpp
new file mode 100644
index 0000000..0bf2898
--- /dev/null
+++ b/test/src/test-instant-messaging.cpp
@@ -0,0 +1,298 @@
+/*
+ * pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+
+#include "purple.h"
+
+#include <glib.h>
+
+#include <signal.h>
+#include <string.h>
+#ifndef _WIN32
+#include <unistd.h>
+#else
+#include "win32/win32dep.h"
+#endif
+
+#define CUSTOM_USER_DIRECTORY  "/dev/null"
+#define CUSTOM_PLUGIN_PATH     ""
+#define PLUGIN_SAVE_PREF       "/purple/nullclient/plugins/saved"
+#define UI_ID                  "nullclient"
+
+/**
+ * The following eventloop functions are used in both pidgin and purple-text. If your
+ * application uses glib mainloop, you can safely use this verbatim.
+ */
+#define PURPLE_GLIB_READ_COND  (G_IO_IN | G_IO_HUP | G_IO_ERR)
+#define PURPLE_GLIB_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
+
+typedef struct _PurpleGLibIOClosure {
+	PurpleInputFunction function;
+	guint result;
+	gpointer data;
+} PurpleGLibIOClosure;
+
+static void purple_glib_io_destroy(gpointer data)
+{
+	g_free(data);
+}
+
+static gboolean purple_glib_io_invoke(GIOChannel *source, GIOCondition condition, gpointer data)
+{
+	PurpleGLibIOClosure *closure = (PurpleGLibIOClosure*)data;
+	int purple_cond = 0;
+
+	if (condition & PURPLE_GLIB_READ_COND)
+		purple_cond |= PURPLE_INPUT_READ;
+	if (condition & PURPLE_GLIB_WRITE_COND)
+		purple_cond |= PURPLE_INPUT_WRITE;
+
+	closure->function(closure->data, g_io_channel_unix_get_fd(source),
+			  (PurpleInputCondition)purple_cond);
+
+	return TRUE;
+}
+
+static guint glib_input_add(gint fd, PurpleInputCondition condition, PurpleInputFunction function,
+							   gpointer data)
+{
+	PurpleGLibIOClosure *closure = g_new0(PurpleGLibIOClosure, 1);
+	GIOChannel *channel;
+	int cond = 0;
+
+	closure->function = function;
+	closure->data = data;
+
+	if (condition & PURPLE_INPUT_READ)
+		cond |= PURPLE_GLIB_READ_COND;
+	if (condition & PURPLE_INPUT_WRITE)
+		cond |= PURPLE_GLIB_WRITE_COND;
+
+#if defined _WIN32 && !defined WINPIDGIN_USE_GLIB_IO_CHANNEL
+	channel = wpurple_g_io_channel_win32_new_socket(fd);
+#else
+	channel = g_io_channel_unix_new(fd);
+#endif
+	closure->result = g_io_add_watch_full(channel, G_PRIORITY_DEFAULT, (GIOCondition)cond,
+					      purple_glib_io_invoke, closure, purple_glib_io_destroy);
+
+	g_io_channel_unref(channel);
+	return closure->result;
+}
+
+static PurpleEventLoopUiOps glib_eventloops =
+{
+	g_timeout_add,
+	g_source_remove,
+	glib_input_add,
+	g_source_remove,
+	NULL,
+	g_timeout_add_seconds,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL
+};
+/*** End of the eventloop functions. ***/
+
+/*** Conversation uiops ***/
+static void
+null_write_conv(PurpleConversation *conv, const char *who, const char *alias,
+			const char *message, PurpleMessageFlags flags, time_t mtime)
+{
+	const char *name;
+	if (alias && *alias)
+		name = alias;
+	else if (who && *who)
+		name = who;
+	else
+		name = NULL;
+
+	printf("(%s) %s %s: %s\n", purple_conversation_get_name(conv),
+			purple_utf8_strftime("(%H:%M:%S)", localtime(&mtime)),
+			name, message);
+}
+
+static PurpleConversationUiOps null_conv_uiops =
+{
+	NULL,                      /* create_conversation  */
+	NULL,                      /* destroy_conversation */
+	NULL,                      /* write_chat           */
+	NULL,                      /* write_im             */
+	null_write_conv,           /* write_conv           */
+	NULL,                      /* chat_add_users       */
+	NULL,                      /* chat_rename_user     */
+	NULL,                      /* chat_remove_users    */
+	NULL,                      /* chat_update_user     */
+	NULL,                      /* present              */
+	NULL,                      /* has_focus            */
+	NULL,                      /* custom_smiley_add    */
+	NULL,                      /* custom_smiley_write  */
+	NULL,                      /* custom_smiley_close  */
+	NULL,                      /* send_confirm         */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+null_ui_init(void)
+{
+	/**
+	 * This should initialize the UI components for all the modules. Here we
+	 * just initialize the UI for conversations.
+	 */
+	purple_conversations_set_ui_ops(&null_conv_uiops);
+}
+
+static PurpleCoreUiOps null_core_uiops =
+{
+	NULL,
+	NULL,
+	null_ui_init,
+	NULL,
+
+	/* padding */
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_libpurple(void)
+{
+	/* Set a custom user directory (optional) */
+	purple_util_set_user_dir(CUSTOM_USER_DIRECTORY);
+
+	/* We do not want any debugging for now to keep the noise to a minimum. */
+	purple_debug_set_enabled(FALSE);
+
+	/* Set the core-uiops, which is used to
+	 * 	- initialize the ui specific preferences.
+	 * 	- initialize the debug ui.
+	 * 	- initialize the ui components for all the modules.
+	 * 	- uninitialize the ui components for all the modules when the core terminates.
+	 */
+	purple_core_set_ui_ops(&null_core_uiops);
+
+	/* Set the uiops for the eventloop. If your client is glib-based, you can safely
+	 * copy this verbatim. */
+	purple_eventloop_set_ui_ops(&glib_eventloops);
+
+	/* Set path to search for plugins. The core (libpurple) takes care of loading the
+	 * core-plugins, which includes the protocol-plugins. So it is not essential to add
+	 * any path here, but it might be desired, especially for ui-specific plugins. */
+	purple_plugins_add_search_path(CUSTOM_PLUGIN_PATH);
+
+	/* Now that all the essential stuff has been set, let's try to init the core. It's
+	 * necessary to provide a non-NULL name for the current ui to the core. This name
+	 * is used by stuff that depends on this ui, for example the ui-specific plugins. */
+	if (!purple_core_init(UI_ID)) {
+		/* Initializing the core failed. Terminate. */
+		fprintf(stderr,
+				"libpurple initialization failed. Dumping core.\n"
+				"Please report this!\n");
+		abort();
+	}
+
+	/* Load the preferences. */
+	purple_prefs_load();
+
+	/* Load the desired plugins. The client should save the list of loaded plugins in
+	 * the preferences using purple_plugins_save_loaded(PLUGIN_SAVE_PREF) */
+	purple_plugins_load_saved(PLUGIN_SAVE_PREF);
+}
+
+static void
+signed_on(PurpleConnection *gc, gpointer null)
+{
+	PurpleAccount *account = purple_connection_get_account(gc);
+	printf("Account connected: %s %s\n", purple_account_get_username(account), purple_account_get_protocol_id(account));
+}
+
+static void
+buddy_signed_on(PurpleBuddy *buddy) {
+	PurpleConnection *gc = purple_account_get_connection(purple_buddy_get_account(buddy));
+	PurplePlugin* prpl = purple_connection_get_prpl(gc);
+	PurplePluginProtocolInfo* prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
+
+	if (prpl_info->send_file && (prpl_info->can_receive_file && prpl_info->can_receive_file(gc, "sradomski@localhost"))) {
+		prpl_info->send_file(gc, "sradomski@localhost", "/Users/sradomski/Documents/W3C Standards.pdf");
+	}
+
+}
+
+static void
+connect_to_signals_for_demonstration_purposes_only(void)
+{
+	static int handle;
+	purple_signal_connect(purple_connections_get_handle(), "signed-on", &handle,
+												PURPLE_CALLBACK(signed_on), NULL);
+	purple_signal_connect(purple_blist_get_handle(), "buddy-signed-on", &handle,
+												PURPLE_CALLBACK(buddy_signed_on), NULL);
+}
+
+int main(int argc, char *argv[])
+{
+	GList *iter;
+	GMainLoop *loop = g_main_loop_new(NULL, FALSE);
+	PurpleAccount *account;
+	PurpleSavedStatus *status;
+
+#ifndef _WIN32
+	/* libpurple's built-in DNS resolution forks processes to perform
+	 * blocking lookups without blocking the main process.  It does not
+	 * handle SIGCHLD itself, so if the UI does not you quickly get an army
+	 * of zombie subprocesses marching around.
+	 */
+	signal(SIGCHLD, SIG_IGN);
+#endif
+
+	init_libpurple();
+
+	printf("libpurple initialized.\n");
+
+	iter = purple_plugins_get_protocols();
+
+	/* Create the account */
+	account = purple_account_new("uscxml@localhost", "prpl-jabber");
+
+	/* Get the password for the account */
+	purple_account_set_password(account, "password", NULL, NULL);
+
+	/* It's necessary to enable the account first. */
+	purple_account_set_enabled(account, UI_ID, TRUE);
+
+	/* Now, to connect the account(s), create a status and activate it. */
+	status = purple_savedstatus_new(NULL, PURPLE_STATUS_AVAILABLE);
+	purple_savedstatus_activate(status);
+
+	connect_to_signals_for_demonstration_purposes_only();
+
+	g_main_loop_run(loop);
+
+	return 0;
+}
+