Merge branch 'master' of https://github.com/dibyendumajumdar/ravi

CMakeLists.txt

@@ -15,6 +15,7 @@ option(STATIC_BUILD "Build static version of Ravi, default is OFF" OFF)
 option(EMBEDDED_DMRC "Controls whether the embedded dmrC feature should be enabled, default is OFF" OFF)
 option(COMPUTED_GOTO "Controls whether the interpreter switch will use computed gotos on gcc/clang, default is OFF" ON)
 option(ASM_VM "Controls whether to use the new VM (not ready yet! so don't turn on)" OFF)
+option(LTESTS "Controls whether ltests are enabled in Debug mode" OFF)
 
 if (ASM_VM)
     # For now we switch to static build 
@@ -112,7 +113,7 @@ if (APPLE)
 endif ()
 
 include_directories("${PROJECT_SOURCE_DIR}/include")
-if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND NOT ASM_VM)
+if (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "DEBUG" AND NOT ASM_VM AND LTESTS)
     # Note that enabling ltests.h messes with global_State and thus interferes with ASM_VM
     message(STATUS "Enabling Lua extended test harness 'ltests'")
     add_definitions(-DLUA_USER_H="ltests.h")

README.rst

@@ -29,6 +29,7 @@ Features
 
 Recent Work
 ===========
+* A `distribution of Ravi/Lua 5.3 <https://github.com/dibyendumajumdar/ravi-distro>`_ is in the works - this will provide ready made binary downloads of Ravi/Lua with select high quality libraries.
 * `Experimental Type Annotations`_ for user defined types was implemented in Oct 2017.
 * A new `X86-64 VM written in assembler <https://github.com/dibyendumajumdar/ravi/tree/master/vmbuilder>`_ using `dynasm <https://luajit.org/dynasm.html>`_ tool is under development currently.
 

build-utils/cmake-64bit-llvm.bat

@@ -3,5 +3,5 @@ cd llvm64
 rem pre LLVM 3.9
 rem cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -G "Visual Studio 14 Win64" -DLLVM_JIT=ON -DLLVM_DIR=c:\LLVM37\share\llvm\cmake ..
 rem cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -G "Visual Studio 15 2017 Win64" -DLLVM_JIT=ON -DLLVM_DIR=c:\d\LLVM40_64\lib\cmake\llvm ..
-cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -G "Visual Studio 15 2017 Win64" -DSTATIC_BUILD=ON -DLLVM_JIT=ON -DLLVM_DIR=c:\LLVM5_64\lib\cmake\llvm ..
+cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -G "Visual Studio 15 2017 Win64" -DSTATIC_BUILD=ON -DLLVM_JIT=ON -DLLVM_DIR=c:\Software\llvm501r\lib\cmake\llvm ..
 cd ..

build-utils/cmake-64bit-nojit-assertions-asmvm.bat

@@ -1,4 +1,4 @@
 mkdir asmvm
 cd asmvm
-cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -DSTATIC_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DASM_VM=ON -G "Visual Studio 15 Win64" ..
+cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi-asmvm -DSTATIC_BUILD=ON -DCMAKE_BUILD_TYPE=Debug -DASM_VM=ON -G "Visual Studio 15 2017 Win64" ..
 cd ..

build-utils/cmake-64bit-nojit-assertions.bat

@@ -1,4 +1,4 @@
 mkdir nojit64a
 cd nojit64a
-cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -DCMAKE_BUILD_TYPE=Debug -G "Visual Studio 15 Win64" ..
+cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -DCMAKE_BUILD_TYPE=Debug -DLTESTS=ON -G "Visual Studio 15 2017 Win64" ..
 cd ..

build-utils/cmake-64bit-nojit.bat

@@ -1,4 +1,4 @@
 mkdir nojit64
 cd nojit64
-cmake -DCMAKE_INSTALL_PREFIX=c:\ravi -DCMAKE_BUILD_TYPE=Release -DSTATIC_BUILD=ON -G "Visual Studio 15 Win64" ..
+cmake -DCMAKE_INSTALL_PREFIX=c:\Software\ravi -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -G "Visual Studio 15 2017 Win64" ..
 cd ..