Builds and links and tests ok on linux now

3 files changed, 17 insertions, 5 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index 55e5c1f..b65dc37 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -20,10 +20,22 @@
 #ifndef JSCDATAMODEL_H_KN8TWG0V
 #define JSCDATAMODEL_H_KN8TWG0V
 
+#include "uscxml/config.h"
 #include "uscxml/plugins/DataModel.h"
 #include <list>
 #include <set>
+
+/**
+ * There are two variants with JavaScriptCore headers
+ * Still beats the >20 V8 variants =D
+ */
+#if defined(HAS_JSC_JAVASCRIPTCORE_H)
 #include <JavaScriptCore/JavaScriptCore.h>
+#elif defined(HAS_JSC_JAVASCRIPT_H)
+#include <JavaScriptCore/JavaScript.h>
+#else
+#error "Did not find header for JSC?"
+#endif
 
 #ifdef BUILD_AS_PLUGINS
 #include "uscxml/plugins/Plugins.h"
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index 8b2bb04..bfa29d8 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -47,9 +47,9 @@ static XMLCh* JS2XMLString(const v8::Local<v8::Value>& value) {
 	return(ret);
 }
 
-// javascript magic here
+// this is the version we support here
+#define SWIG_V8_VERSION 0x032317
 
-#define SWIG_V8_VERSION 0x034000
 #include "V8DOM.cpp.inc"
 
 namespace uscxml {
diff --git a/src/uscxml/util/URL.cpp b/src/uscxml/util/URL.cpp
index ad271d5..a576f8b 100644
--- a/src/uscxml/util/URL.cpp
+++ b/src/uscxml/util/URL.cpp
@@ -138,10 +138,10 @@ URL URLImpl::resolveWithCWD(URLImpl* relative) {
 	if (!getcwd(currPath, sizeof(currPath))) {
 		ERROR_PLATFORM_THROW("Cannot get current working directory");
 	}
-	currPath[sizeof(currPath) - 1] = '\0'; /* not really required */
+	currPath[sizeof(currPath) - 1] = '\0'; /* not really required? */
 
-
-	std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string("file://") + currPath));
+    // without the trailing slash, last component is assumed a file
+	std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string("file://") + currPath + PATH_SEPERATOR));
 
 	return resolve(relative, cwdURL.get());
 }