Merge pull request #297 from layus/master2

Various fixes for travis & appveyor

Author: sjmackenzie

.travis.yml

@@ -1,35 +1,43 @@
-language: cpp
-compiler:
-  - gcc
-before_install:
-  - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq libboost1.55-all-dev tk8.5-dev emacs23-nox
-  - if [ "$CXX" = "g++" ]; then sudo apt-get install -qq g++-4.8; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+language: generic
+dist: trusty
+sudo: false
+matrix:
+  include:
+    # Versions before 3.8 are not included nor whitelisted
+
+    # Broken (uses ubuntu's version, not llvm one. {LLVM,Clang}Config.cmake are beyond redemption
+    #- env: [ "V=3.8", "PREFIX=/usr/lib/llvm-3.8" ]
+    #  addons:
+    #    apt:
+    #      sources: [ "ubuntu-toolchain-r-test", "llvm-toolchain-trusty-3.8" ]
+    #      packages: [ "libboost-all-dev", "tcl-dev", "tk-dev", "emacs", "clang-3.8", "libclang-3.8-dev", "llvm-3.8-dev" ]
+
+    # Broken: Unknown relocation 0x2a (llvm-3.9 known to be bugged on travis)
+    #- env: [ "V=3.9", "PREFIX=/usr/lib/llvm-3.9/lib/cmake" ]
+    #  addons:
+    #    apt:
+    #      sources: [ "ubuntu-toolchain-r-test", "llvm-toolchain-trusty-3.9" ]
+    #      packages: [ "libboost-all-dev", "tcl-dev", "tk-dev", "emacs", "clang-3.9", "libclang-3.9-dev", "llvm-3.9-dev" ]
+
+    # Works, with heavy fixing (see below)
+    - env: [ "V=4.0", "PREFIX=/usr/lib/llvm-4.0/lib/cmake", "BIN=/usr/lib/llvm-4.0/bin" ]
+      addons:
+        apt:
+          sources: [ "ubuntu-toolchain-r-test", "llvm-toolchain-trusty-4.0" ]
+          packages: [ "libboost-all-dev", "tcl-dev", "tk-dev", "emacs", "clang-4.0", "libclang-4.0-dev", "llvm-4.0-dev", "clang-format-4.0", "clang-tidy-4.0" ]
+
 before_script:
-  - mkdir externals
-  - cd externals
-  - svn co --quiet http://googletest.googlecode.com/svn/trunk gtest
-  - svn co --quiet http://llvm.org/svn/llvm-project/llvm/tags/RELEASE_33/final llvm
-  - cd llvm/tools/
-  - svn co --quiet http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_33/final clang
-  - cd ../../..
-  - mkdir builds
-  - cd builds
-  - mkdir gtest-debug
-  - cd gtest-debug
-  - cmake -DCMAKE_BUILD_TYPE=Debug ../../externals/gtest
-  - make -j3
-  - cd ..
-  - mkdir llvm-release
-  - cd llvm-release
-  - cmake -DCMAKE_BUILD_TYPE=Release ../../externals/llvm
-  - make -j3
-  - cd ../..
+  - apt list --installed
+  - env
+  # Fix clang cmake dirs
+  - if [ $V == 3.9 ]; then  sudo -E ln -sn /usr/share/llvm-3.9/cmake /usr/lib/llvm-3.9/lib/cmake/clang;     fi
+
+  - if [ $V == 4.0 ]; then  sudo -E ln -sn /usr/share/llvm-4.0/cmake /usr/lib/llvm-4.0/lib/cmake/clang;     fi
+  - if [ $V == 4.0 ]; then  sudo -E ln -sn /usr/share/llvm-4.0/cmake /usr/lib/llvm-4.0/lib/cmake/clang-4.0; fi
+  - if [ $V == 4.0 ]; then  sudo -E ln -s  /usr/bin/*                /usr/lib/llvm-4.0/bin || true;         fi
+
 script:
-  - cd builds
-  - mkdir mozart2-release
-  - cd mozart2-release
-  - cmake -DCMAKE_BUILD_TYPE=Release -DGTEST_SRC_DIR=../../externals/gtest -DGTEST_BUILD_DIR=../gtest-debug -DLLVM_SRC_DIR=../../externals/llvm -DLLVM_BUILD_DIR=../llvm-release ../..
-  - make -j3
+  - export SOURCES=$(pwd) && mkdir ../build && cd ../build
+  - cmake -DCMAKE_BUILD_TYPE=Release -DMOZART_BOOST_USE_STATIC_LIBS=False -DCMAKE_PROGRAM_PATH=$BIN -DCMAKE_PREFIX_PATH=$PREFIX $SOURCES
+  - make dist VERBOSE=1
+  - make VERBOSE=1

CMakeLists.txt

@@ -93,7 +93,7 @@ add_subdirectory(lib)
 add_subdirectory(opi)
 add_subdirectory(wish)
 add_subdirectory(stdlib)
-add_subdirectory(platform-test)
+add_subdirectory(platform-test EXCLUDE_FROM_ALL)
 
 # Add launcher and icons
 if(UNIX)

platform-test/CMakeLists.txt

@@ -197,8 +197,6 @@ add_custom_target(
     DEPENDS ${TEST_FUNCTORS_OZF})
 # Run the tests when "make test" is executed
 if(BUILD_TESTING)
-    # running vmtest (gtest)
-    add_test("vmtest" "${CMAKE_CURRENT_BINARY_DIR}/../vm/vm/test/vmtest")
     # running tests in platform-test
     if(NOT WIN32)
       set(OZEMULATOR "${CMAKE_CURRENT_BINARY_DIR}/../boosthost/emulator/ozemulator")

vm/CMakeLists.txt

@@ -13,9 +13,11 @@ set(LLVM_BUILD_DIR ${DEFAULT_LLVM_BUILD_DIR} CACHE PATH "Path to LLVM build (wit
 set(MOZART_GENERATOR_FLAGS "${DEFAULT_MOZART_GENERATOR_FLAGS}" CACHE STRING
     "Additional flags for the generator parser (clang)")
 
+add_compile_options(-std=c++0x)
+
 add_subdirectory(generator)
 
-set(CMAKE_CXX_FLAGS "-Wall -std=c++0x ${CMAKE_CXX_FLAGS}")
+add_compile_options(-Wall)
 
 add_subdirectory(vm)
 add_subdirectory(boostenv)

vm/boostenv/main/boostvm.cc

@@ -47,7 +47,7 @@ BoostVM::BoostVM(BoostEnvironment& environment,
                  std::unique_ptr<std::string>&& app, bool isURL) :
   VirtualMachine(environment, options), env(environment),
   vm(this), identifier(identifier),
-  uuidGenerator(random_generator),
+  uuidGenerator(),
   portClosed(false),
   _asyncIONodeCount(0),
   preemptionTimer(environment.io_service),

vm/generator/main/CMakeLists.txt

@@ -6,8 +6,8 @@ message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 find_package(Clang REQUIRED CONFIG)
 message(STATUS "Found Clang using ClangConfig.cmake in: ${Clang_DIR}")
 
-#include_directories(${LLVM_INCLUDE_DIRS})
-#add_definitions(${LLVM_DEFINITIONS})
+include_directories(${LLVM_INCLUDE_DIRS})
+add_definitions(${LLVM_DEFINITIONS})
 
 add_executable(generator EXCLUDE_FROM_ALL generator.cc interfaces.cc implementations.cc builtins.cc utils.cc)
 target_link_libraries(generator clangFrontend clangAST)

vm/vm/CMakeLists.txt

@@ -1,2 +1,2 @@
 add_subdirectory(main)
-add_subdirectory(test)
+add_subdirectory(test EXCLUDE_FROM_ALL)

vm/vm/test/CMakeLists.txt

@@ -14,6 +14,7 @@ add_executable(vmtest testutils.cc sanitytest.cc smallinttest.cc floattest.cc
   atomtest.cc gctest.cc coderstest.cc utftest.cc stringtest.cc
   virtualstringtest.cc bytestringtest.cc)
 target_link_libraries(vmtest mozartvm gtest gtest_main)
+add_test(vmtest vmtest)
 
 if(NOT MINGW)
   target_link_libraries(vmtest pthread)

vm/vm/test/gtest

@@ -208,9 +208,9 @@ void readHandler(ClientData clientData, int mask)
   int code = Tcl_GlobalEval(interp, buffer);
   if (code != TCL_OK) {
     char buf[1000];
-    DebugCode(fprintf(dbgin,"### Error(%d):  %s\n", code,interp->result);
+    DebugCode(fprintf(dbgin,"### Error(%d):  %s\n", code, Tcl_GetStringResult(interp));
               fflush(dbgin));
-    sprintf(buf,"w --- %s---  %s\n---\n.\n", buffer,interp->result);
+    sprintf(buf,"w --- %s---  %s\n---\n.\n", buffer, Tcl_GetStringResult(interp));
     sendToEngine(buf);
   }
 
@@ -251,7 +251,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCm
      */
     if (Tcl_Init(interp) == TCL_ERROR ||
         Tk_Init(interp) == TCL_ERROR) {
-      WishPanic("Tcl_Init failed: %s\n", interp->result);
+      WishPanic("Tcl_Init failed: %s\n", Tcl_GetStringResult(interp));
     }
 
     Tcl_ResetResult(interp);
@@ -282,7 +282,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCm
     code = Tcl_GlobalEval(interp, "wm withdraw . ");
     if (code != TCL_OK) {
       char buf[1000];
-      sprintf(buf,"w %s\n.\n", interp->result);
+      sprintf(buf,"w %s\n.\n", Tcl_GetStringResult(interp));
       sendToEngine(buf);
     }