Permalink
Browse files

Merge branch 'master' into virtual-memory-regions

  • Loading branch information...
2 parents 2257503 + f6305d3 commit 80f0f0532dabf2d4c4bb3dd17aea16a574d1db44 @jrfonseca jrfonseca committed Feb 10, 2016
Showing 616 changed files with 121,774 additions and 37,533 deletions.
View
@@ -0,0 +1,19 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+
+[*.{markdown,md}]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[{Makefile,*.mk}]
+indent_style = tab
+indent_size = 8
+tab_width = 8
View
@@ -27,6 +27,7 @@
*.so
*.trace
*.zip
+*.ubj
_CPack_Packages
CMakeCache.txt
CMakeFiles
@@ -37,6 +38,10 @@ build
dxsdk
eglretrace
glretrace
+guids_test
install_manifest.txt
qapitrace
+qubjson_test
+trace_parser_flags_test
traces
+Testing
View
@@ -1 +0,0 @@
-set sw=4 ts=8 et
View
@@ -0,0 +1,79 @@
+branches:
+ except:
+ - /^appveyor.*$/
+
+sudo: required
+dist: trusty
+
+language: generic
+
+env:
+ global:
+ - MAKEFLAGS=-j2
+
+matrix:
+ include:
+ - os: linux
+ env:
+ - APT_REPOS="ppa:ubuntu-toolchain-r/test"
+ - APT_PACKAGES="gcc-4.9 g++-4.9 libdwarf-dev libprocps3-dev qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev"
+ - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 -DENABLE_GUI=1"
+ - os: linux
+ env:
+ - APT_REPOS="ppa:ubuntu-toolchain-r/test"
+ - APT_PACKAGES="gcc-4.9-multilib g++-4.9-multilib"
+ - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9 -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_SYSTEM_LIBRARY_PATH=/usr/lib32 -DENABLE_GUI=0"
+ - os: linux
+ env:
+ - APT_PACKAGES="clang-3.6 libc++-dev libc++abi-dev libdwarf-dev libprocps3-dev qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev"
+ - CMAKE_OPTIONS="-DCMAKE_C_COMPILER=clang-3.6 -DCMAKE_CXX_COMPILER=clang++-3.6 -DCMAKE_CXX_FLAGS=-stdlib=libc++ -DENABLE_GUI=1"
+ - os: linux
+ env:
+ - APT_REPOS="ppa:tobydox/mingw-x-trusty"
+ - APT_PACKAGES="mingw32-x-gcc"
+ - MINGW_ROOT=/opt/mingw32
+ - MINGW_PREFIX=i686-w64-mingw32
+ - CMAKE_OPTIONS="-DCMAKE_TOOLCHAIN_FILE=Toolchain.cmake -Cdxsdk-master/Cache-mingw32.cmake -DENABLE_GUI=0"
+ - os: osx
+ env:
+ - CMAKE_OPTIONS="-DENABLE_GUI=1"
+
+before_install:
+- |
+ if [ "$APT_PACKAGES" ]
+ then for APT_REPO in $APT_REPOS
+ do
+ sudo add-apt-repository -y $APT_REPO
+ done
+ if [ "$CXX" == "clang++" ]
+ then
+ wget -nv -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
+ sudo apt-add-repository -y 'deb http://llvm.org/apt/trusty llvm-toolchain-trusty-3.6 main'
+ fi
+ sudo apt-get update -qq
+ sudo apt-get install -qq -y $APT_PACKAGES
+ fi
+- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install qt5; export CMAKE_PREFIX_PATH=$(brew --prefix qt5); fi
+- if [ "$MINGW_ROOT" ]; then export PATH=$MINGW_ROOT/bin:$PATH; fi
+- cmake --version
+
+script:
+- |
+ if [ "$MINGW_PREFIX" ]
+ then
+ echo "set (CMAKE_SYSTEM_NAME Windows)" >> Toolchain.cmake
+ echo "set (CMAKE_C_COMPILER $MINGW_PREFIX-gcc)" >> Toolchain.cmake
+ echo "set (CMAKE_CXX_COMPILER $MINGW_PREFIX-g++)" >> Toolchain.cmake
+ echo "set (CMAKE_RC_COMPILER $MINGW_PREFIX-windres)" >> Toolchain.cmake
+ echo "set (CMAKE_FIND_ROOT_PATH $MINGW_ROOT)" >> Toolchain.cmake
+ echo "set (CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)" >> Toolchain.cmake
+ echo "set (CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)" >> Toolchain.cmake
+ echo "set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)" >> Toolchain.cmake
+ wget -q -O - https://github.com/apitrace/dxsdk/archive/master.tar.gz | tar -xz
+ fi
+- cmake -H. -Bbuild $CMAKE_OPTIONS
+- cmake --build build --use-stderr -- -k
+- cmake --build build --use-stderr --target check -- -k
+- cmake --build build --use-stderr --target package -- -k
+
+# vim: set sw=2 et :
View
@@ -49,7 +49,12 @@ MY_APITRACE_ROOT := $(TOPDIR)external/apitrace
MY_APITRACE_BUILD_ROOT_HOST := out/host/apitrace
MY_APITRACE_BUILD_ROOT_TARGET := out/target/apitrace
-apitrace_private_target:
+MY_ANDROID_CMAKE_COMMIT := 556cc14296c226f753a3778d99d8b60778b7df4f
+
+android.toolchain.cmake:
+ curl -s -O https://raw.githubusercontent.com/taka-no-me/android-cmake/$(MY_ANDROID_CMAKE_COMMIT)/android.toolchain.cmake
+
+apitrace_private_target: android.toolchain.cmake
$(hide) # apitrace: run cmake for the host if it has not been run
$(hide) if [ ! -e $(MY_APITRACE_BUILD_ROOT_HOST)/Makefile ] ; then \
cd $(MY_APITRACE_ROOT) && \
@@ -61,7 +66,7 @@ apitrace_private_target:
$(hide) if [ ! -e $(MY_APITRACE_BUILD_ROOT_TARGET)/Makefile ] ; then \
cd $(MY_APITRACE_ROOT) && \
cmake \
- -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain/android.toolchain.cmake \
+ -DCMAKE_TOOLCHAIN_FILE=android.toolchain.cmake \
-DANDROID_NDK=../../$(NDK) \
-DANDROID_NDK_LAYOUT=LINARO \
-DANDROID_TOOLCHAIN_NAME=$(TOOLCHAIN) \
Oops, something went wrong.

0 comments on commit 80f0f05

Please sign in to comment.