summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-08-26 08:54:58 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2014-08-26 08:54:58 (GMT)
commitd90b15c96271d2afd45d649e3e22030004359d6e (patch)
treedb773868e71fd51fb05e5160e1138bec8087eac9 /contrib
parent93802c6eab1f798ccf57e863127aef6e7f9d073c (diff)
downloaduscxml-d90b15c96271d2afd45d649e3e22030004359d6e.zip
uscxml-d90b15c96271d2afd45d649e3e22030004359d6e.tar.gz
uscxml-d90b15c96271d2afd45d649e3e22030004359d6e.tar.bz2
API changes with receiveEvent
- receiveEvent will deliver to external queue now per default - switched Interpreter implementations to the new algorithm from spec
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/build-scripts/build-arabica-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-arabica-macosx.sh3
-rwxr-xr-xcontrib/build-scripts/build-ffmpeg-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-glog-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-glog-macosx.sh3
-rwxr-xr-xcontrib/build-scripts/build-libevent-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-libevent-macosx.sh3
-rwxr-xr-xcontrib/build-scripts/build-swi-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-swi-macosx.sh3
-rwxr-xr-xcontrib/build-scripts/build-v8-linux.sh3
-rwxr-xr-xcontrib/build-scripts/build-v8-macosx.sh (renamed from contrib/build-scripts/build-v8-mac.sh)3
-rwxr-xr-xcontrib/build-scripts/platform-id-linux.sh12
-rwxr-xr-xcontrib/build-scripts/platform-id-mac.sh19
-rw-r--r--contrib/ctest/CTestCustom.ctest.in31
14 files changed, 54 insertions, 41 deletions
diff --git a/contrib/build-scripts/build-arabica-linux.sh b/contrib/build-scripts/build-arabica-linux.sh
index be20faf..712aec4 100755
--- a/contrib/build-scripts/build-arabica-linux.sh
+++ b/contrib/build-scripts/build-arabica-linux.sh
@@ -10,7 +10,8 @@ set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
-DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ ! -f src/arabica.cpp ]; then
echo
diff --git a/contrib/build-scripts/build-arabica-macosx.sh b/contrib/build-scripts/build-arabica-macosx.sh
index c5a4bb9..c79cc2e 100755
--- a/contrib/build-scripts/build-arabica-macosx.sh
+++ b/contrib/build-scripts/build-arabica-macosx.sh
@@ -12,7 +12,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
MACOSX_VER=`/usr/bin/sw_vers -productVersion`
MACOSX_COMP=(`echo $MACOSX_VER | tr '.' ' '`)
-DEST_DIR="${DIR}/../prebuilt/darwin-i386/${MACOSX_COMP[0]}.${MACOSX_COMP[1]}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-mac.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
SYSROOT=`xcrun --show-sdk-path`
if [ ! -f src/arabica.cpp ]; then
diff --git a/contrib/build-scripts/build-ffmpeg-linux.sh b/contrib/build-scripts/build-ffmpeg-linux.sh
index cb4ec92..b10482e 100755
--- a/contrib/build-scripts/build-ffmpeg-linux.sh
+++ b/contrib/build-scripts/build-ffmpeg-linux.sh
@@ -10,7 +10,8 @@ set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
-DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ -d /tmp/build-ffmpeg ]; then
rm -rf /tmp/build-ffmpeg
diff --git a/contrib/build-scripts/build-glog-linux.sh b/contrib/build-scripts/build-glog-linux.sh
index a33698e..6fa5d78 100755
--- a/contrib/build-scripts/build-glog-linux.sh
+++ b/contrib/build-scripts/build-glog-linux.sh
@@ -10,7 +10,8 @@ set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
-DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ ! -f src/glog/log_severity.h ]; then
echo
diff --git a/contrib/build-scripts/build-glog-macosx.sh b/contrib/build-scripts/build-glog-macosx.sh
index 3363883..a1d6cd4 100755
--- a/contrib/build-scripts/build-glog-macosx.sh
+++ b/contrib/build-scripts/build-glog-macosx.sh
@@ -11,7 +11,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
MACOSX_VER=`/usr/bin/sw_vers -productVersion`
MACOSX_COMP=(`echo $MACOSX_VER | tr '.' ' '`)
-DEST_DIR="${DIR}/../prebuilt/darwin-i386/${MACOSX_COMP[0]}.${MACOSX_COMP[1]}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-mac.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ ! -f src/glog/log_severity.h ]; then
echo
diff --git a/contrib/build-scripts/build-libevent-linux.sh b/contrib/build-scripts/build-libevent-linux.sh
index c57ad52..401e16d 100755
--- a/contrib/build-scripts/build-libevent-linux.sh
+++ b/contrib/build-scripts/build-libevent-linux.sh
@@ -10,7 +10,8 @@ set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
-DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ ! -f event.c ]; then
echo
diff --git a/contrib/build-scripts/build-libevent-macosx.sh b/contrib/build-scripts/build-libevent-macosx.sh
index 23f288b..5423992 100755
--- a/contrib/build-scripts/build-libevent-macosx.sh
+++ b/contrib/build-scripts/build-libevent-macosx.sh
@@ -11,7 +11,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
MACOSX_VER=`/usr/bin/sw_vers -productVersion`
MACOSX_COMP=(`echo $MACOSX_VER | tr '.' ' '`)
-DEST_DIR="${DIR}/../prebuilt/darwin-i386/${MACOSX_COMP[0]}.${MACOSX_COMP[1]}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-mac.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
if [ ! -f event.c ]; then
echo
diff --git a/contrib/build-scripts/build-swi-linux.sh b/contrib/build-scripts/build-swi-linux.sh
index 7b32d4d..239d292 100755
--- a/contrib/build-scripts/build-swi-linux.sh
+++ b/contrib/build-scripts/build-swi-linux.sh
@@ -11,7 +11,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
#DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
-DEST_DIR="/home/sradomski/Desktop"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
VERSION=`cat VERSION`
if [ ! -f src/pl-main.c ]; then
diff --git a/contrib/build-scripts/build-swi-macosx.sh b/contrib/build-scripts/build-swi-macosx.sh
index eff80b5..289327d 100755
--- a/contrib/build-scripts/build-swi-macosx.sh
+++ b/contrib/build-scripts/build-swi-macosx.sh
@@ -11,7 +11,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
MACOSX_VER=`/usr/bin/sw_vers -productVersion`
MACOSX_COMP=(`echo $MACOSX_VER | tr '.' ' '`)
-DEST_DIR="${DIR}/../prebuilt/darwin-i386/${MACOSX_COMP[0]}.${MACOSX_COMP[1]}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-mac.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
VERSION=`cat VERSION`
if [ ! -f src/pl-main.c ]; then
diff --git a/contrib/build-scripts/build-v8-linux.sh b/contrib/build-scripts/build-v8-linux.sh
index 5991e1c..256a5c6 100755
--- a/contrib/build-scripts/build-v8-linux.sh
+++ b/contrib/build-scripts/build-v8-linux.sh
@@ -10,7 +10,8 @@ set -e
ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
CPUARCH=`uname -m`
-DEST_DIR="${DIR}/../prebuilt/linux-${CPUARCH}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-linux.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
PWD=`pwd`
if [ ! -f src/v8.h ]; then
diff --git a/contrib/build-scripts/build-v8-mac.sh b/contrib/build-scripts/build-v8-macosx.sh
index e979c4d..9396251 100755
--- a/contrib/build-scripts/build-v8-mac.sh
+++ b/contrib/build-scripts/build-v8-macosx.sh
@@ -12,7 +12,8 @@ ME=`basename $0`
DIR="$( cd "$( dirname "$0" )" && pwd )"
MACOSX_VER=`/usr/bin/sw_vers -productVersion`
MACOSX_COMP=(`echo $MACOSX_VER | tr '.' ' '`)
-DEST_DIR="${DIR}/../prebuilt/darwin-i386/${MACOSX_COMP[0]}.${MACOSX_COMP[1]}/gnu"
+PLATFORM_ID=`${DIR}/platform-id-mac.sh`
+DEST_DIR="${DIR}/../prebuilt/${PLATFORM_ID}"
PWD=`pwd`
export MACOSX_DEPLOYMENT_TARGET=10.6
diff --git a/contrib/build-scripts/platform-id-linux.sh b/contrib/build-scripts/platform-id-linux.sh
new file mode 100755
index 0000000..9efac91
--- /dev/null
+++ b/contrib/build-scripts/platform-id-linux.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+function version {
+ echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }';
+}
+
+CMAKE_INFO=`cmake --system-information 2> /dev/null`
+
+CMAKE_CXX_COMPILER_ID=`echo "$CMAKE_INFO" |grep 'CMAKE_CXX_COMPILER_ID ' | awk '{print tolower($2)}' |sed 's/\"//g'`
+CPU=`uname -m`
+
+echo "linux-${CPU}-${CMAKE_CXX_COMPILER_ID}"
diff --git a/contrib/build-scripts/platform-id-mac.sh b/contrib/build-scripts/platform-id-mac.sh
new file mode 100755
index 0000000..b105be3
--- /dev/null
+++ b/contrib/build-scripts/platform-id-mac.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+function version {
+ echo "$@" | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }';
+}
+
+CMAKE_INFO=`cmake --system-information 2> /dev/null`
+
+CURRENT_OSX_VERSION=`echo "$CMAKE_INFO" |grep CURRENT_OSX_VERSION |grep -v _CURRENT_OSX_VERSION | awk '{print $2}' |sed 's/\"//g'`
+CMAKE_CXX_COMPILER_ID=`echo "$CMAKE_INFO" |grep 'CMAKE_CXX_COMPILER_ID ' | awk '{print tolower($2)}' |sed 's/\"//g' | sed 's/apple//g'`
+CPU=`uname -m`
+
+CPP_LIB="libc++"
+if [ "$(version "10.9.0")" -gt "$(version "$CURRENT_OSX_VERSION")" ]; then
+ # pre-mavericks
+ CPP_LIB="libstdc++"
+fi
+
+echo "darwin-${CPU}-${CMAKE_CXX_COMPILER_ID}-${CPP_LIB}"
diff --git a/contrib/ctest/CTestCustom.ctest.in b/contrib/ctest/CTestCustom.ctest.in
index 4f4ef83..6b5fd3c 100644
--- a/contrib/ctest/CTestCustom.ctest.in
+++ b/contrib/ctest/CTestCustom.ctest.in
@@ -12,38 +12,9 @@ set(CTEST_CUSTOM_TESTS_IGNORE
"ecma/test178.scxml" # Manual - PASSED
"ecma/test230.scxml" # Manual - PASSED
"ecma/test250.scxml" # Manual - PASSED
+ "ecma/test301.scxml" # Manual - PASSED
"ecma/test307.scxml" # Manual - PASSED
"ecma/test415.scxml" # Manual - PASSED
- "ecma/test463.scxml" # XPath hardcoded
- "ecma/test464.scxml" # XPath hardcoded
- "ecma/test465.scxml" # XPath hardcoded
- "ecma/test466.scxml" # XPath hardcoded
- "ecma/test467.scxml" # XPath hardcoded
- "ecma/test468.scxml" # XPath hardcoded
- "ecma/test469.scxml" # XPath hardcoded
- "ecma/test470.scxml" # XPath hardcoded
- "ecma/test473.scxml" # XPath hardcoded
- "ecma/test474.scxml" # XPath hardcoded
- "ecma/test475.scxml" # XPath hardcoded
- "ecma/test476.scxml" # XPath hardcoded
- "ecma/test477.scxml" # XPath hardcoded
- "ecma/test478.scxml" # XPath hardcoded
- "ecma/test479.scxml" # XPath hardcoded
- "ecma/test480.scxml" # XPath hardcoded
- "ecma/test481.scxml" # XPath hardcoded
- "ecma/test482.scxml" # XPath hardcoded
- "ecma/test483.scxml" # XPath hardcoded
- "ecma/test537.scxml" # XPath hardcoded
- "ecma/test539.scxml" # XPath hardcoded
- "ecma/test540.scxml" # XPath hardcoded
- "ecma/test542.scxml" # XPath hardcoded
- "ecma/test543.scxml" # XPath hardcoded
- "ecma/test544.scxml" # XPath hardcoded
- "ecma/test545.scxml" # XPath hardcoded
- "ecma/test546.scxml" # XPath hardcoded
- "ecma/test547.scxml" # XPath hardcoded
- "ecma/test555.scxml" # XPath hardcoded
- "ecma/test568.scxml" # XPath hardcoded
"fsm/ecma/test178.scxml" # manual test
"fsm/ecma/test224.scxml" # automatically generated id has the form stateid.platformid