master the use of docker. maybe

ThePhD · ThePhD · commit 962ff6cf61c0 · 2017-12-31T21:15:43.000-05:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,91 @@
+# Python (Bytecode)
+*.pyc
+
+# ninja files
+*.ninja
+
+# Visual Studio
+*.props
+*.user
+.vs/
+Debug/
+Release/
+x64/
+x86/
+*.pyproj
+*.vcxproj
+*.vcxproj.filters
+*.tlog
+*.lastbuildstate
+*.idb
+*.sln
+*.gitattributes
+
+# VSCode
+.vscode/
+
+# CMake
+build/
+build-sol2/
+CMakeCache.txt
+CMakeFiles/
+
+# Compiler outputs
+obj/*
+bin/*
+main.exe
+main.o
+lua53.dll
+lua-5.3.4.dll
+main.ilk
+main.pdb
+
+# Dropbox interference
+.dropbox*
+
+# QtCreator
+*.creator.user.*
+*.config
+*.creator
+*.files
+*.includes
+
+# Scratchpad Files
+m.lua
+catch_mock.hpp
+main_aux.cpp
+main.hpp
+main2.cpp
+main.cpp
+
+# Local Lua Testbeds
+lua-5.3.4-cxx/
+lua-5.3.4/
+lua-5.3.2/
+lua-5.3.1/
+lua-5.3.0/
+lua-5.2.4/
+lua-5.2.2/
+lua-5.2.3/
+lua-5.1.5/
+LuaJIT-2.1.0/
+luajit-2.0.5/
+luajit-2.0.3/
+include/
+liblua.a
+lib/liblua5.2.a
+
+# Docs Artefacts
+docs/build/
+
+# Sublime Text
+*.sublime-workspace
+*.sublime-project
+
+
+# Windows Crap
+desktop.ini
+*.db
+
+# Miscellaneous
+external/
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 Debug/
 Release/
 x64/
+x86/
+*.pyproj
 *.vcxproj
 *.vcxproj.filters
 *.tlog
@@ -24,12 +26,19 @@ x64/
 
 # CMake
 build/
+build-sol2/
 CMakeCache.txt
 CMakeFiles/
 
 # Compiler outputs
 obj/*
 bin/*
+main.exe
+main.o
+lua53.dll
+lua-5.3.4.dll
+main.ilk
+main.pdb
 
 # Dropbox interference
 .dropbox*
@@ -42,51 +51,42 @@ bin/*
 *.includes
 
 # Scratchpad Files
+m.lua
+main.lua
+catch_mock.hpp
+main_aux.cpp
+main.hpp
 main2.cpp
 main.cpp
 
 # Local Lua Testbeds
+lua-5.3.4-cxx/
+lua-5.3.4/
 lua-5.3.2/
 lua-5.3.1/
 lua-5.3.0/
 lua-5.2.4/
 lua-5.2.2/
 lua-5.2.3/
 lua-5.1.5/
+LuaJIT-2.1.0/
 luajit-2.0.5/
 luajit-2.0.3/
 include/
 liblua.a
 lib/liblua5.2.a
 
-# Windows Crap
-desktop.ini
-*.sublime-workspace
+# Docs Artefacts
 docs/build/
+
+# Sublime Text
+*.sublime-workspace
 *.sublime-project
-m.lua
-single/sol.hpp
+
+
+# Windows Crap
+desktop.ini
 *.db
-lua53.dll
-main.exe
-main.o
-lua-5.3.4/
-main.lua
-LuaJIT-2.1.0/
-lua-5.3.4-cxx/
-lua-5.3.4.vcxproj-cxx.filters
-sol.pyproj
-lua-5.3.4.dll
-main.ilk
-main.pdb
-lua-5.3.4-cxx/
-lua-5.3.4/
-temp.bad_runtime.lua
-temp.bad_syntax.lua
-temp.good.lua
-catch_mock.hpp
-main_aux.cpp
-main.hpp
-tmp_thingy_user.lua
-tmp_thingy.lua
+
+# Miscellaneous
 external/
diff --git a/.travis.yml b/.travis.yml
@@ -23,48 +23,61 @@
 sudo: required
 language: cpp
 
+git:
+  depth: 5
+
 services:
 - docker
 
 before_install:
-- sudo apt install -y git zsh
-- sudo curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
-- sudo chmod +x /usr/local/bin/docker-compose
-- sudo usermod -aG docker ${USER}
-- sudo docker-compose --version
+- sudo apt install -y git
 
 script:
-- sudo docker-compose build
-- sudo docker-compose run -e "LUA_VERSION=$LUA_VERSION" -e "LLVM_VERSION=$LLVM_VERSION" -e "GCC_VERSION=$GCC_VERSION" test
+- sudo docker image build --tag sol2:ci --build-arg "CI=${CI}" --build-arg "LUA_VERSION=${LUA_VERSION}" --build-arg "GCC_VERSION=${GCC_VERSION}" --build-arg "LLVM_VERSION=${LLVM_VERSION}" . 
+- sudo docker run --name "sol2.test" --tty --env "CI=${CI}" --env "LUA_VERSION=${LUA_VERSION}" --env "GCC_VERSION=${GCC_VERSION}" --env "LLVM_VERSION=${LLVM_VERSION}" sol2:ci 
+- sudo docker rm $(sudo docker ps -a -q)
+- sudo docker rmi $(sudo docker image ls -q)
 
 env:
     # GCC 4.9.x, 5.x, 6.x, 7.x
   - LUA_VERSION=5.3.4
     GCC_VERSION=4.9
+    CI=true
   - LUA_VERSION=5.3.4
     GCC_VERSION=5
+    CI=true
   - LUA_VERSION=5.3.4
     GCC_VERSION=6
+    CI=true
   - LUA_VERSION=5.3.4
     GCC_VERSION=7
+    CI=true
     # LLVM 3.6.x -> 5.0.x
   - LUA_VERSION=5.3.4
     LLVM_VERSION=3.6.2
+    CI=true
   - LUA_VERSION=5.3.4
     LLVM_VERSION=3.7.1
+    CI=true
   - LUA_VERSION=5.3.4
     LLVM_VERSION=3.8.1
+    CI=true
   - LUA_VERSION=5.3.4
     LLVM_VERSION=3.9.0
+    CI=true
   - LUA_VERSION=5.3.4
     LLVM_VERSION=4.0.1
+    CI=true
   - LUA_VERSION=5.3.4
     LLVM_VERSION=5.0.1
+    CI=true
     # Lua Versions 5.2.4, 5.1.5, and maybe LuaJIT (as well as x86)
   - LUA_VERSION=5.2.4
     GCC_VERSION=7
+    CI=true
   - LUA_VERSION=5.1.5
     GCC_VERSION=7
+    CI=true
 
 matrix:
   fast_finish: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -199,19 +199,23 @@ if (TESTS OR TESTS_SINGLE OR EXAMPLES OR TESTS_EXAMPLES)
 	endif()
 	find_package(Threads)
 	# Find way to get Lua: build if requested, or attempt to build if no matching version is found
-	string(TOLOWER ${LUA_VERSION} NORMALIZED_LUA_VERSION)
 	if (BUILD_LUA OR BUILD_LUAJIT)
 		include(LuaBuild)
-	elseif (NORMALIZED_LUA_VERSION MATCHES "5.1")
-		find_package(Lua 5.1 EXACT REQUIRED)
-	elseif(NORMALIZED_LUA_VERSION MATCHES "5.2")
-		find_package(Lua 5.2 EXACT REQUIRED)
-	elseif(NORMALIZED_LUA_VERSION MATCHES "5.3")
-		find_package(Lua 5.3 EXACT REQUIRED)
-	elseif(NORMALIZED_LUA_VERSION MATCHES "luajit")
-		find_package(LuaJIT REQUIRED)
+	elseif (NOT LUA_VERSION)
+		# can't do anything
 	else()
-		include(LuaBuild)	
+		string(TOLOWER ${LUA_VERSION} NORMALIZED_LUA_VERSION)
+		if (NORMALIZED_LUA_VERSION MATCHES "5.1")
+			find_package(Lua 5.1 EXACT REQUIRED)
+		elseif(NORMALIZED_LUA_VERSION MATCHES "5.2")
+			find_package(Lua 5.2 EXACT REQUIRED)
+		elseif(NORMALIZED_LUA_VERSION MATCHES "5.3")
+			find_package(Lua 5.3 EXACT REQUIRED)
+		elseif(NORMALIZED_LUA_VERSION MATCHES "luajit")
+			find_package(LuaJIT REQUIRED)
+		else()
+			include(LuaBuild)	
+		endif()
 	endif()
 
 	if (NOT LUA_FOUND)
diff --git a/Dockerfile b/Dockerfile
@@ -22,25 +22,31 @@
 
 # Start from the ubuntu:xenial image
 FROM ubuntu:xenial
+# We want our working directory to be the toplevel
+WORKDIR /
 # Everything from our current directory (repo toplevel in travis-ci)
 # should be copied into our container at the top-level sol2 directory
-ADD . /sol2
+ADD . sol2
+ARG CI=true
+ARG LUA_VERSION=5.3.4
+ARG GCC_VERSION
+ARG LLVM_VERSION
 #VOLUME /sol2
-# We want our working directory to be the toplevel
-WORKDIR /
+# Potential environment variables
+ENV LUA_VERSION=${LUA_VERSION} GCC_VERSION=${GCC_VERSION} LLVM_VERSION=${LLVM_VERSION} CI=${CI}
 # RUN is how you write to the image you've pulled down
 # RUN actions are "committed" to the image, and everything will
 # start from the base after all run commands are executed
-RUN apt update
-RUN apt -y install sudo zsh
-RUN apt -y dist-upgrade
-RUN mkdir -p build-sol2/Debug build-sol2/Release
-RUN chmod +x /sol2/scripts/preparation.linux.sh
-RUN ["/usr/bin/env", "zsh", "-c", "-x", "./sol2/scripts/preparation.linux.sh"]
+RUN apt-get update
+RUN apt-get -y install sudo zsh
+RUN apt-get -y dist-upgrade
+RUN mkdir -p /build-sol2/Debug /build-sol2/Release
+RUN chmod +x /sol2/scripts/preparation.linux.sh /sol2/scripts/run.linux.sh
+RUN ["/usr/bin/env", "zsh", "-e", "/sol2/scripts/preparation.linux.sh"]
 # CMD/ENTRYPOINT is different from RUN
 # these are done on a per-instantiation and essentially describe
 # the DEFAULT behavior of this container when its started, not what state it
 # gets "saved" in...
 # it only runs the last CMD/ENTRYPOINT as the default behavior:
 # multiple CMDs will not be respected
-CMD ["/usr/bin/env", "zsh", "-c", "-x", "chmod +x /sol2/scripts/run.linux.sh && ./sol2/scripts/run.linux.sh"]
+ENTRYPOINT ["/usr/bin/env", "zsh", "-x", "-e", "/sol2/scripts/run.linux.sh"]
diff --git a/cmake/Modules/LuaVanillaBuild.cmake b/cmake/Modules/LuaVanillaBuild.cmake
@@ -304,6 +304,9 @@ target_compile_definitions(${liblua}
 if (MSVC)
 	target_compile_options(${liblua}
 		PRIVATE /W1)
+else()
+	target_compile_options(${liblua}
+		PRIVATE -w -Wno-implicit-fallthrough)
 endif()
 if (WIN32)
 	#target_compile_definitions(${liblua} 
diff --git a/scripts/preparation.linux.llvm.sh b/scripts/preparation.linux.llvm.sh
diff --git a/scripts/preparation.linux.sh b/scripts/preparation.linux.sh
diff --git a/scripts/run.linux.sh b/scripts/run.linux.sh
