Some fixes for the build slaves

10 files changed, 43 insertions, 25 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f97435..861b5b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,6 +113,27 @@ else()
 	endif()
 endif()
 
+if (NOT EXISTS ${PROJECT_SOURCE_DIR}/contrib/prebuilt/include)
+	message(STATUS "Downloading header files: ${USCXML_LIBRARY_HOST_URL_PREFIX}/${USCXML_VERSION}/include.tgz")
+	file(DOWNLOAD ${USCXML_LIBRARY_HOST_URL_PREFIX}/${USCXML_VERSION}/include.tgz
+		${PROJECT_SOURCE_DIR}/contrib/prebuilt/include.tgz
+		INACTIVITY_TIMEOUT 60 STATUS DOWNLOAD_STATUS SHOW_PROGRESS)
+	list(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+	list(GET DOWNLOAD_STATUS 1 STATUS_STRING)
+	if(STATUS_CODE EQUAL 0)
+		execute_process(
+			COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/contrib/prebuilt/include.tgz
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/contrib/prebuilt/
+		)
+		execute_process(
+			COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_SOURCE_DIR}/contrib/prebuilt/include.tgz
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/contrib/prebuilt/
+		)
+	else()
+		message("Downloading header files failed with ${STATUS_STRING}")
+	endif()
+endif()
+
 if (NOT EXISTS ${USCXML_PREBUILT_LIBRARY_PATH})
 	message(STATUS "Downloading prebuilt libraries: ${USCXML_LIBRARY_HOST_URL_PREFIX}/${USCXML_VERSION}/${USCXML_LIBRARY_ARCHIVE_NAME}")
 	file(DOWNLOAD ${USCXML_LIBRARY_HOST_URL_PREFIX}/${USCXML_VERSION}/${USCXML_LIBRARY_ARCHIVE_NAME}
@@ -132,6 +153,7 @@ if (NOT EXISTS ${USCXML_PREBUILT_LIBRARY_PATH})
 	else()
 		message("Downloading prebuilt libraries failed with ${STATUS_STRING} - maybe this platform is not supported?")
 	endif()
+
 endif()
 
 if (WIN32 OR CMAKE_CROSSCOMPILING)
diff --git a/contrib/ctest/common.ctest.inc b/contrib/ctest/common.ctest.inc
index c0ec100..53a6c83 100644
--- a/contrib/ctest/common.ctest.inc
+++ b/contrib/ctest/common.ctest.inc
@@ -101,6 +101,11 @@ if (NOT RETAIN_BUILD_DIR)
 	ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 endif()
 
+if (REMOVE_PREBUILDS)
+	file(REMOVE_RECURSE ${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt)
+	file(MAKE_DIRECTORY ${CTEST_SOURCE_DIRECTORY}/contrib/prebuilt)
+endif()
+
 ctest_start(${CTEST_SUBMIT_TYPE}) # start testing
 #
 # I accidentally resynced when running from IDE thrice!
diff --git a/contrib/ctest/hosts/buildslave-centos-5-32.ctest b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
index cfc542f..dfc4434 100644
--- a/contrib/ctest/hosts/buildslave-centos-5-32.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-5-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-centos-5-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - ECMA datamodel")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.1.2 - XPath datamodel")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-centos-6-64.ctest b/contrib/ctest/hosts/buildslave-centos-6-64.ctest
index beeeefd..1636078 100644
--- a/contrib/ctest/hosts/buildslave-centos-6-64.ctest
+++ b/contrib/ctest/hosts/buildslave-centos-6-64.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-centos-6-64")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.4.6")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.4.6")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
index 717dcc7..f00af2b 100644
--- a/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
+++ b/contrib/ctest/hosts/buildslave-fedora-16-64.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-fedora-16-64")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc 4.6.3")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
index 9192089..0d56b13 100644
--- a/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
+++ b/contrib/ctest/hosts/buildslave-opensuse-12-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-opensuse-12-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.7.2")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
index a09480e..ed37664 100644
--- a/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
+++ b/contrib/ctest/hosts/buildslave-ubuntu-1204-32.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "buildslave-ubuntu-1204-32")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86 gcc 4.6.3")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/ctest/hosts/centos6x64-vii.ctest b/contrib/ctest/hosts/centos6x64-vii.ctest
index d18bdaf..5249ee2 100644
--- a/contrib/ctest/hosts/centos6x64-vii.ctest
+++ b/contrib/ctest/hosts/centos6x64-vii.ctest
@@ -3,11 +3,13 @@ set(CTEST_SITE "centos6x64-vii")
 set(CTEST_BUILD_CONFIGURATION "Debug")
 
 set(RETAIN_BUILD_DIR OFF)
+set(REMOVE_PREBUILDS ON)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc")
 include("tests/ecma.ctest")
 include("common.ctest.inc")
 
 set(RETAIN_BUILD_DIR ON)
+set(REMOVE_PREBUILDS OFF)
 set(CTEST_BUILD_NAME "linux-x86_64 gcc")
 include("tests/xpath.ctest")
 include("common.ctest.inc")
diff --git a/contrib/local/compress_and_upload_deps.sh b/contrib/local/compress_and_upload_deps.sh
index 3cc9684..cf7c758 100755
--- a/contrib/local/compress_and_upload_deps.sh
+++ b/contrib/local/compress_and_upload_deps.sh
@@ -38,5 +38,9 @@ for FILE in ${PLATFORMS}; do
     tar cvzf uscxml-prebuilt-${PLATFORM}.tgz ${FILE}
     scp uscxml-prebuilt-${PLATFORM}.tgz ${USCXML_PREBUILT_HOST}:${USCXML_PREBUILT_PATH}/${VERSION}
     rm uscxml-prebuilt-${PLATFORM}.tgz
+	else
+		tar cvzf include.tgz ${FILE}
+    scp include.tgz ${USCXML_PREBUILT_HOST}:${USCXML_PREBUILT_PATH}/${VERSION}
+    rm include.tgz
   fi
 done
\ No newline at end of file
diff --git a/contrib/prebuilt/include/ical.h b/contrib/prebuilt/include/ical.h
deleted file mode 100644
index 78d555c..0000000
--- a/contrib/prebuilt/include/ical.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/************************************************************************
-
- FILE:         ical.h
- CREATOR:      ajc 2008-sep-01
-
- (C) COPYRIGHT 2008 by Art Cancro
- http://freeassociation.sourceforge.net
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of either:
-
-    The LGPL as published by the Free Software Foundation, version 2.1
-
-  Or:
-
-    The Mozilla Public License Version 1.0.
-
- ************************************************************************/
-
-#ifdef _MSC_VER
-#pragma message("WARNING: #include <ical.h> is deprecated.  Please #include <libical/ical.h> instead.")
-#else
-#warning "#include <ical.h> is deprecated.  Please #include <libical/ical.h> instead."
-#endif
-#include <libical/ical.h>