Merge remote-tracking branch 'upstream/master'

Author: jmgasper

.github/TESTRUNNER.md

@@ -1,8 +1,8 @@
 # testRunner
 
-We use [testRunner](https://www.pxscene.org/examples/px-reference/test-run/testRunner.js) to run JavaScript tests that exercise pxObjects and the JavaScript wrappers. By default, testRunner will run the tests located here: [tests.json](https://www.pxscene.org/examples/px-reference/test-run/tests.json).  For our Travis CI builds, however, the tests.json from pxCore/tests/pxScene2d/tests/testRunner/tests.json will be used.
+We use [testRunner](https://px-apps.sys.comcast.net/pxscene-samples/examples/px-reference/test-run/testRunner_v7.js) to run JavaScript tests that exercise pxObjects and the JavaScript wrappers. When no _tests_ parameter is passed to it, testRunner will run the tests located here: [tests.json](https://px-apps.sys.comcast.net/pxscene-samples/examples/px-reference/test-run/tests.json).  For our Travis CI builds, however, the tests to run will come from two test files in pxCore/tests/pxScene2d/tests/testRunner: tests.json and testsDesktop.json.  All new tests should be added to tests.json unless the test is a special case that would exceed the memory constraints of embedded devices.  For those special tests, they should be added to testsDesktop.json, instead.
 
-*testRunner* will run all tests defined in tests.json and will report success and failure from those tests.  When tests have completed, it will display a Results page indicating how many tests succeeded and how many failed. If there are failures, the details of those failures will be displayed as a list on screen.  These results will also be output to the console/log.
+*testRunner* will run all tests defined in the json files passed to it and will report success and failure from those tests.  When tests have completed, it will display a Results page indicating how many tests succeeded and how many failed. If there are failures, the details of those failures will be displayed as a list on screen.  These results will also be output to the console/log.
 
 ## Adding a testRunner Test:
 1. Create a test JavaScript file according to instructions in [Defining Tests](#defining-test-functions-to-be-run). We suggest creating a pull request to add the test to [pxscene](https://github.com/pxscene/pxscene/tree/gh-pages) for open source availability.

.gitmodules

@@ -3,27 +3,39 @@ matrix:
   - os: linux
     dist: trusty
     sudo: required
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        packages:
+        - gcc-6
+        - g++-6
+    env:
+      - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
   - os: osx
-    osx_image: xcode6.4
+    osx_image: xcode9.4
 language: c++
 before_install:
+- eval "${MATRIX_EVAL}"
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then openssl aes-256-cbc -K $encrypted_8b763c087de9_key -iv $encrypted_8b763c087de9_iv -in pxscene-build.pem.enc -out /tmp/pxscene-build.pem -d; fi
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then  eval "$(ssh-agent -s)"; fi
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then  chmod 0600 /tmp/pxscene-build.pem; fi
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then  ssh-add /tmp/pxscene-build.pem; fi
 - ./ci/before_install.sh
-- if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then export PATH=/usr/local/opt/ccache/libexec:$PATH; fi
+- if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] && [ "$TRAVIS_OS_NAME" = "osx" ] ; then export PATH=/usr/local/opt/ccache/libexec:$PATH ; fi
+- if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] && [ "$TRAVIS_OS_NAME" = "linux" ] ; then export PATH=/usr/lib/ccache:$PATH ; fi
+- gcc -v && g++ -v 
 install:
 - ./ci/install.sh
 before_script:
-- if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then ccache -s; fi
+- if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] ; then ccache -s; fi
 - ./ci/before_script.sh
-- if [ "$TRAVIS_EVENT_TYPE" = "api" ]; then export linenumber=`awk '/CFBundleShortVersionString/{ print NR; exit }' $TRAVIS_BUILD_DIR/examples/pxScene2d/src/macstuff/Info.plist`;export PX_VERSION=`sed -n "\`echo $((linenumber+1))\`p" $TRAVIS_BUILD_DIR/examples/pxScene2d/src/macstuff/Info.plist|awk -F '<string>' '{print $2}'|awk -F'</string>' '{print $1}'`; fi
-- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] ; then export PX_VERSION="edge" ; fi
+- if [ "$TRAVIS_EVENT_TYPE" = "api" ] || [ ! -z "${TRAVIS_TAG}" ] ;  then export linenumber=`awk '/CFBundleShortVersionString/{ print NR; exit }' $TRAVIS_BUILD_DIR/examples/pxScene2d/src/macstuff/Info.plist`;export PX_VERSION=`sed -n "\`echo $((linenumber+1))\`p" $TRAVIS_BUILD_DIR/examples/pxScene2d/src/macstuff/Info.plist|awk -F '<string>' '{print $2}'|awk -F'</string>' '{print $1}'`; fi
+- if [ "$TRAVIS_EVENT_TYPE" = "cron" ] ; then export PX_VERSION=edge_`date +%Y-%m-%d` ; fi
 script:
 - ./ci/script.sh
-- if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then codecov --build "$TRAVIS_OS_NAME-$TRAVIS_COMMIT-$TRAVIS_BUILD_NUMBER" -X gcov -f $TRAVIS_BUILD_DIR/tracefile ; fi
-- if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then genhtml -o $TRAVIS_BUILD_DIR/logs/codecoverage $TRAVIS_BUILD_DIR/tracefile; fi
+- if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] ; then codecov --build "$TRAVIS_OS_NAME-$TRAVIS_COMMIT-$TRAVIS_BUILD_NUMBER" -X gcov -f $TRAVIS_BUILD_DIR/tracefile ; fi
+- if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] ; then genhtml -o $TRAVIS_BUILD_DIR/logs/codecoverage $TRAVIS_BUILD_DIR/tracefile; fi
 after_script:
 - ./ci/after_script.sh
 - if [ "$TRAVIS_EVENT_TYPE" != "pull_request" ]; then  rm -rf /tmp/pxscene-build.pem; fi

.travis.yml

@@ -5,6 +5,7 @@ option(BUILD_PXCORE "BUILD_PXCORE" ON)
 option(BUILD_PXSCENE "BUILD_PXSCENE" ON)
 option(BUILD_PX_TESTS "BUILD_PX_TESTS" OFF)
 option(BUILD_RTREMOTE_LIBS "BUILD_RTREMOTE_LIBS" OFF)
+option(BUILD_PXBENCHMARK "BUILD_PXBENCHMARK" OFF)
 
 option(PREFER_SYSTEM_LIBRARIES "Prefer to use system libraries over bundled." "OFF")
     # Fine selection of which external node package to pick-up, if multiple are installed on the system
@@ -15,6 +16,7 @@ option(DISABLE_DEBUG_MODE "Disable debugging mode." "OFF") # OFF for backward co
 
 option(SUPPORT_DUKTAPE "SUPPORT_DUKTAPE" ON)
 option(SUPPORT_NODE "SUPPORT_NODE" ON)
+option(SUPPORT_V8 "SUPPORT_V8" OFF)
 
 option(ENABLE_THREAD_SANITIZER "ENABLE_THREAD_SANITIZER" OFF)
 option(ENABLE_ADDRESS_SANITIZER "ENABLE_ADDRESS_SANITIZER" OFF)
@@ -55,3 +57,8 @@ if (BUILD_PX_TESTS)
     message("Including unit test support")
     add_subdirectory(tests/pxScene2d)
 endif (BUILD_PX_TESTS)
+
+if (BUILD_PXBENCHMARK)
+    message("Building pxbenchmark")
+    add_subdirectory(examples/pxBenchmark/src)
+endif (BUILD_PXBENCHMARK)

CMakeLists.txt

@@ -1,26 +1,28 @@
 # pxCore
 
-pxCore is a small opensource library that provides a portable framebuffer and windowing abstraction for C++. This library is intended to hide the complexity of writing rasterization code on multiple platforms and allows you to easily write the following sorts of things in a portable way.
+pxCore is a small open source library that provides a portable framebuffer and windowing abstraction for C++. This library is intended to hide the complexity of writing rasterization code on multiple platforms and allows you to easily write the following sorts of things in a portable way:
 
 * 2d and 3d rasterizers
 * Transition Libraries
 * Filter Routines
 * Image Processing
 
-In its design a few principles were followed:
+In its design, a few principles were followed:
 
 * Be Small – A simple windowed application can be built (on Windows) in as little as 8k.
 * Be Simple – The framebuffer abstraction supports 32bpp framebuffers and is intended to be minimal yet complete.
-* Don’t tightly couple the framebuffer and windowing functionality. Some other framebuffer libraries (PixelToaster for one) don’t separate out the framebuffer abstraction from the windowing abstraction. By loosely coupling the two abstractions this library becomes much more valuable because the framebuffer functionality can be used and integrated with other windowing toolkits easily, thereby making YOUR code more reusable.
+* Don’t tightly couple the framebuffer and windowing functionality. Some other framebuffer libraries (eg. PixelToaster) don’t separate out the framebuffer abstraction from the windowing abstraction. By loosely coupling the two abstractions, this library becomes much more valuable. The framebuffer functionality can be used and integrated with other windowing toolkits easily, making YOUR code more reusable.
 * Platform native surface construction
 * Policy free resizing support – No policy is baked into the window resizing support so that applications completely control their own resizing behavior.
 * Portable Keyboard, Mouse and Window events
 * Support for portable performance timers
-* Basic Animation Support - Support for a basic animation timer event (frames per second) is built into the windowing abstraction making it easy to write applications that animate their contents.
-* pxCore has been ported to Windows, pocketpc (arm4), linux(x11), OSX.
+* Basic Animation Support - Support for a basic animation timer event (frames per second) is built into the windowing abstraction, making it easy to write applications that animate their contents.
+* pxCore has been ported to Windows, pocketpc (arm4), linux(x11), and OSX.
 
 
-The most popular usage of pxCore is __pxscene__. __pxscene__ is an application engine that exposes a scene graph API to a Javascript engine. It gives javascript applications access to the pxscene API for visual elements that can be used for composition.  __pxscene__ is written over top of pxCore. __pxscene__: 
+The most popular usage of pxCore is __pxscene__. __pxscene__ is an application engine that exposes a scene graph API to a Javascript engine. It gives JavaScript applications access to the pxscene API for visual elements that can be used for composition.  __pxscene__ is written on top of pxCore. 
+
+__pxscene__: 
 
 * supports rich animation and alpha masking primitives
 * exposes a DOM-like programming model
@@ -29,6 +31,6 @@ The most popular usage of pxCore is __pxscene__. __pxscene__ is an application e
 
 __pxscene__ source code is in pxCore/examples/pxScene2d.
 Instructions for building __pxscene__ are here: [Building pxscene](https://github.com/pxscene/pxCore/blob/master/examples/pxScene2d/README.md)
-Instructions for debugging __pxscene__ javascript applications using VSCode are here: [Debugging applications](https://github.com/pxscene/pxCore/blob/master/examples/pxScene2d/VSCODE_DEBUG.md)
+Instructions for debugging __pxscene__ JavaScript applications using VSCode are here: [Debugging applications](https://github.com/pxscene/pxCore/blob/master/examples/pxScene2d/VSCODE_DEBUG.md)
 
 

README.md

@@ -46,4 +46,6 @@ build_script:
 
 test: off
 
+cache:		
+    - c:/dw/pxCore/examples/pxScene2d/external/vc.build/builds/
 # validator: https://ci.appveyor.com/tools/validate-yaml

appveyor.yml

@@ -16,23 +16,23 @@ checkError()
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]
 then
-    if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ]
+    if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ] || [ ! -z "${TRAVIS_TAG}" ]
     then
       echo "Ignoring after script stage for $TRAVIS_EVENT_TYPE event";
       exit 0;
     fi
 fi
 
 cd $TRAVIS_BUILD_DIR
-if [ "$TRAVIS_EVENT_TYPE" = "push" ] ;
+if [ "$TRAVIS_EVENT_TYPE" = "push" ] && [ -z "${TRAVIS_TAG}" ] 
 then
   tar -cvzf logs.tgz logs/*
   checkError $? "Unable to compress logs folder" "Check for any previous tasks failed" "Retry"
   ./ci/deploy_files.sh 96.116.56.119 logs.tgz;
   checkError $? "Unable to send log files to 96.116.56.119" "Possible reason - Server could be down" "Retry"
 fi
 
-if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ] ;
+if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ] || [ ! -z "${TRAVIS_TAG}" ]
 then
   mkdir release
   checkError $? "unable to create release directory" "Could be permission issue?" "Retry"
@@ -42,20 +42,20 @@ then
   checkError $? "unable to move artifacts folder to release directory" "artifacts directory created" "Retry"
   tar -cvzf release.tgz release/*
   checkError $? "unable to compress release folder" "release folder present?" "Retry"
-  if [ "$TRAVIS_REPO_SLUG" = "pxscene/pxCore" ] && [ "$TRAVIS_BRANCH" = "master" ] ;
+  if [ "$TRAVIS_REPO_SLUG" = "pxscene/pxCore" ] && ( [ "$TRAVIS_BRANCH" = "master" ] || [ "$TRAVIS_BRANCH" = "$TRAVIS_TAG" ] );
   then
     ./ci/release_osx.sh 96.116.56.119 release.tgz 
     checkError $? "unable to send artifacts to 96.116.56.119" "96.116.56.119 down?" "Retry"
   fi
 fi
 
-if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ;
+if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ] 
 then
   ccache -s
 fi
 
 #update release  notes and info.plist in github
-if [ "$TRAVIS_EVENT_TYPE" = "api" ] && [ "$UPDATE_VERSION" = "true" ] ;
+if ( [ "$TRAVIS_EVENT_TYPE" = "api" ] || [ ! -z "${TRAVIS_TAG}" ] ) && [ "$UPDATE_VERSION" = "true" ] 
 then
    git checkout master
    checkError $? "unable to checkout master branch in pxscene" "" "check the credentials"

ci/after_script.sh

@@ -16,12 +16,3 @@
 
 */
 
-#ifndef _RT_CORS_UTILS
-#define _RT_CORS_UTILS
-
-#include "rtString.h"
-#include "rtError.h"
-
-rtError rtCORSUtilsCheckOrigin(const rtString& origin, const rtString& url, const rtString& headers);
-
-#endif

src/rtCORSUtils.h renamed to ci/apache_license.txt

@@ -26,14 +26,25 @@ $TRAVIS_BUILD_DIR/ci/monitor.sh &
 
 if [ "$TRAVIS_OS_NAME" = "linux" ]
 then
-    if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ]
+    if [ "$TRAVIS_EVENT_TYPE" = "cron" ] || [ "$TRAVIS_EVENT_TYPE" = "api" ] || [ ! -z "${TRAVIS_TAG}" ]
     then
       sudo apt-get install jq
       sudo apt-get install wget
       exit 0;
     fi
 fi
 
+#do the license check
+if [ "$TRAVIS_OS_NAME" = "linux" ] ;
+then
+  $TRAVIS_BUILD_DIR/ci/licenseScanner.sh
+  if [ "$?" != "0" ] 
+  then
+    printf "\n!*!*!* licenseScanner.sh detected files without proper license. Please refer to the logs above. !*!*!*\n"
+    exit 1;
+  fi
+fi
+
 #install necessary basic packages for linux and mac 
 if [ "$TRAVIS_OS_NAME" = "linux" ] ; 
 then 
@@ -56,7 +67,7 @@ fi
 #install lighttpd, code coverage binaries for mac
 if [ "$TRAVIS_OS_NAME" = "osx" ] ; 
 then
-  if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]
+  if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ]
   then
 #    brew install lighttpd
     brew install gcovr
@@ -107,7 +118,7 @@ fi
 
 
 #install codecov
-if [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]
+if ( [ "$TRAVIS_EVENT_TYPE" = "push" ] || [ "$TRAVIS_EVENT_TYPE" = "pull_request" ] ) && [ -z "${TRAVIS_TAG}" ]
 then
 	if [ "$TRAVIS_OS_NAME" = "osx" ] ; 
 	then

ci/before_install.sh

@@ -1,30 +1,32 @@
 #!/bin/sh
 
-currdir=`pwd`
-cd $TRAVIS_BUILD_DIR/tests/pxScene2d/testRunner
-cp tests.json tests.json_orig
+TESTS_DIR="${TRAVIS_BUILD_DIR}/tests/pxScene2d"
+TESTSDESKTOP_JSON="${TESTS_DIR}/testRunner/testsDesktop.json"
+cp "${TESTSDESKTOP_JSON}" "${TESTS_DIR}/testRunner/testsDesktop.json_orig"
 
-#make arrangements for ignoring pxwayland tests for osx and linux
-if [ "$TRAVIS_OS_NAME" = "osx" ]
-then
-	sed -i -n '/pxWayland/d' tests.json
-else
-	sed -i '/pxWayland/d' tests.json
-fi
+TESTS_JSON="${TESTS_DIR}/testRunner/tests.json"
+cp "${TESTS_JSON}" "${TESTS_DIR}/testRunner/tests.json_orig"
 
-#make arrangements for ignoring permissions tests for osx and linux
-if grep -q "_TEST_PERMISSIONS_CHECK\" OFF" "$TRAVIS_BUILD_DIR/tests/pxScene2d/CMakeLists.txt"
-then
-	if [ "$TRAVIS_OS_NAME" = "osx" ]
-	then
-		sed -i -n '/permissions/d' tests.json
-	else
-		sed -i '/permissions/d' tests.json
-	fi
-fi
+drop_json_lines()
+{
+  MATCH=$1
+  FILE=$2
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    sed -i -n "/${MATCH}/d" "${FILE}"
+  else
+    sed -i "/${MATCH}/d" "${FILE}"
+  fi
+  #delete last comma in json file, if any
+  sed -i -e x -e '$ {s/,$//;p;x;}' -e 1d "${FILE}"
+}
 
-#delete last comma in json file, if any
-sed -i -e x -e '$ {s/,$//;p;x;}' -e 1d tests.json
+#make arrangements for ignoring some tests
+drop_json_lines "pxWayland" "${TESTSDESKTOP_JSON}"
+if ! grep -q "TEST_PERMISSIONS_CHECK\" ON" "${TESTS_DIR}/CMakeLists.txt" ; then
+  drop_json_lines "permissions" "${TESTS_JSON}"
+fi
+if ! grep -q "ACCESS_CONTROL_CHECK\" ON" "${TRAVIS_BUILD_DIR}/examples/pxScene2d/src/CMakeLists.txt"; then
+  drop_json_lines "cors" "${TESTS_JSON}"
+fi
 
-cd $currdir
 exit 0;

ci/before_script.sh

@@ -27,7 +27,7 @@ cd temp
 if [ "$TRAVIS_PULL_REQUEST" = "false" ]
 then
 	echo "************************* Generating config files *************************" >> $BUILDLOGS
-	cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON .. >>$BUILDLOGS 2>&1;
+	cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. >>$BUILDLOGS 2>&1;
 	checkError $? "cmake config failed" "Config error" "Check the error in $BUILDLOGS"
 
   echo "************************* Building pxcore,rtcore,pxscene app,libpxscene, unitttests ****" >> $BUILDLOGS
@@ -36,7 +36,7 @@ then
 
 else
   echo "************************* Generating config files ****"
-  cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON .. 1>>$BUILDLOGS;
+  cmake -DBUILD_PX_TESTS=ON -DBUILD_PXSCENE_STATIC_LIB=ON -DBUILD_DEBUG_METRICS=ON -DPXSCENE_TEST_HTTP_CACHE=ON .. 1>>$BUILDLOGS;
   checkError $? "cmake config failed" "Config error" "Check the errors displayed in this window"
 
 	echo "************************* Building pxcore,rtcore,pxscene app,libpxscene, unitttests ********"