Added to appveyor

7 files changed, 44 insertions, 11 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e95e7e8..a74b64b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -522,8 +522,14 @@ else()
 endif()
 
 string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_UC)
-message(STATUS "  CXX Flags : " ${CMAKE_CXX_FLAGS} " " ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UC}})
-message(STATUS "  C   Flags : " ${CMAKE_C_FLAGS} " " ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}})
+message(STATUS "  CXX Flags   : " ${CMAKE_CXX_FLAGS} " " ${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UC}})
+message(STATUS "  C   Flags   : " ${CMAKE_C_FLAGS} " " ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}})
+
+get_directory_property( CDEFLIST DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS )
+foreach( DEF ${CDEFLIST} )
+    set( CDEFS "${CDEFS} ${DEF}" )
+endforeach()
+message(STATUS "  Definitions : " ${CDEFS})
 
 STRING(REGEX REPLACE "${CMAKE_BINARY_DIR}" "BUILD_DIR" REL_CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 STRING(REGEX REPLACE "${CMAKE_SOURCE_DIR}" "SOURCE_DIR" REL_CMAKE_LIBRARY_OUTPUT_DIRECTORY ${REL_CMAKE_LIBRARY_OUTPUT_DIRECTORY})
diff --git a/README.md b/README.md
index fcb7cd5..9baa5e8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # uSCXML ReadMe
 
-[![Build Status](https://travis-ci.org/tklab-tud/uscxml.png?branch=master)](https://travis-ci.org/tklab-tud/uscxml)
+[![Build Status](https://travis-ci.org/tklab-tud/uscxml.png?branch=master)](https://travis-ci.org/tklab-tud/uscxml)[![Build status](https://ci.appveyor.com/api/projects/status/b3mwo7w2qhtjal6f/branch/master?svg=true)](https://ci.appveyor.com/project/sradomski/uscxml/branch/master)
 
 **Note**: We deprecated the [old version](https://github.com/tklab-tud/uscxml/tree/legacy-1.0) and refactored quite a few classes and interfaces.
 
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..61ce222
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,25 @@
+version: 0.6.{build}
+
+shallow_clone: true
+
+environment:
+  matrix:
+    - configuration: Visual Studio 12.0
+      platform: x86
+
+    - configuration: Visual Studio 12.0
+      platform: x64
+
+    - configuration: Visual Studio 14.0
+      platform: x86
+
+    - configuration: Visual Studio 14.0
+      platform: x64
+
+before_build:
+    - call "%ProgramFiles(x86)%\Microsoft %configuration%\VC\vcvarsall.bat" %platform%
+    - mkdir build
+    - cd build
+    - cmake -G "NMake Makefiles" ..
+
+build_script: nmake
\ No newline at end of file
diff --git a/test/bindings/java/org/uscxml/examples/MonitorExample.java b/test/bindings/java/org/uscxml/examples/MonitorExample.java
index 3e3781c..dc4cffa 100644
--- a/test/bindings/java/org/uscxml/examples/MonitorExample.java
+++ b/test/bindings/java/org/uscxml/examples/MonitorExample.java
@@ -3,6 +3,7 @@ package org.uscxml.examples;
 import org.uscxml.Interpreter;
 import org.uscxml.InterpreterException;
 import org.uscxml.InterpreterState;
+import org.uscxml.StringVector;
 import org.uscxml.helper.TestMonitor;
 
 
@@ -20,7 +21,7 @@ public class MonitorExample {
 		try {
 			TestMonitor tm = new TestMonitor();
 			Interpreter scxml = Interpreter.fromURL("https://raw.githubusercontent.com/tklab-tud/uscxml/master/test/w3c/null/test436.scxml");
-			scxml.setMonitor(tm);
+			scxml.addMonitor(tm);
 			InterpreterState state = InterpreterState.USCXML_UNDEF;
 			while((state = scxml.step()) != InterpreterState.USCXML_FINISHED) {
 				switch (state) {
@@ -29,8 +30,14 @@ public class MonitorExample {
 				case USCXML_IDLE:
 				case USCXML_INITIALIZED:
 				case USCXML_INSTANTIATED:
+					break;
 				case USCXML_MICROSTEPPED:
 				case USCXML_MACROSTEPPED:
+					StringVector states = scxml.getConfiguration();
+					for (int i = 0; i < states.size(); i++) {
+						System.out.print(states.get(i) + " ");
+					}
+					System.out.println();
 				case USCXML_CANCELLED:
 					break;
 				default:
diff --git a/test/bindings/java/org/uscxml/helper/TestMonitor.java b/test/bindings/java/org/uscxml/helper/TestMonitor.java
index f8289bd..2b71d82 100644
--- a/test/bindings/java/org/uscxml/helper/TestMonitor.java
+++ b/test/bindings/java/org/uscxml/helper/TestMonitor.java
@@ -1,6 +1,5 @@
 package org.uscxml.helper;
 
-import org.uscxml.InterpreterIssue;
 import org.uscxml.InterpreterMonitor;
 import org.uscxml.StringList;
 
@@ -68,9 +67,5 @@ public class TestMonitor extends InterpreterMonitor {
 		System.out.println("afterInvoking: " + xpath + " " + invokeid);
 	}
 
-	@Override
-	public void reportIssue(InterpreterIssue issue) {
-		System.out.println(issue);
-	}
 	
 }
diff --git a/test/bindings/java/org/uscxml/tests/JexlDataModelTest.java b/test/bindings/java/org/uscxml/tests/JexlDataModelTest.java
index bb681b0..876feb2 100644
--- a/test/bindings/java/org/uscxml/tests/JexlDataModelTest.java
+++ b/test/bindings/java/org/uscxml/tests/JexlDataModelTest.java
@@ -37,7 +37,7 @@ public class JexlDataModelTest {
 				System.out.println(testName);
 
 				Interpreter scxml = Interpreter.fromURL(testName);
-				scxml.setMonitor(tm);
+				scxml.addMonitor(tm);
 
 				while (scxml.step() != InterpreterState.USCXML_FINISHED) {
 				}
diff --git a/test/src/test-c89-parser.cpp b/test/src/test-c89-parser.cpp
index a9e5d34..9a4d570 100644
--- a/test/src/test-c89-parser.cpp
+++ b/test/src/test-c89-parser.cpp
@@ -14,7 +14,7 @@ void testC89Parser() {
 	c89_debug = 0;
 
     std::list<std::string> localTest = {
-    "int main() { a = 10; }"
+        "int main() { a = 10; }"
     };
     
     for (auto test : localTest) {