Finished CMake based build

Author: mkottman

CMakeLists.txt

@@ -16,39 +16,49 @@ set ( SRC ${CMAKE_CURRENT_SOURCE_DIR}/src )
 set ( BIN ${CMAKE_CURRENT_BINARY_DIR})
 set ( LIB ${BIN}/lib )
 
-message ( STATUS "Compiling metalua" )
+message ( STATUS "Preparing the metalua libraries" )
 
 file ( COPY ${SRC}/lib/ DESTINATION ${LIB} PATTERN ".in" EXCLUDE )
 configure_file ( ${SRC}/lib/metalua/package2.lua.in ${LIB}/metalua/package2.lua )
-configure_file ( ${SRC}/compiler/metalua.mlua.in ${BIN}/metalua.mlua )
+configure_file ( ${SRC}/compiler/metalua.mlua.in ${LIB}/metalua.mlua )
+
+message ( STATUS "Compiling the parts of the compiler written in plain Lua" )
 
 execute_process (
   COMMAND ${LUAC} -o ${LIB}/metalua/bytecode.luac
     lopcodes.lua lcode.lua ldump.lua compile.lua
-  WORKING_DIRECTORY ${SRC}/compiler )
-
-execute_process (
   COMMAND ${LUAC} -o ${LIB}/metalua/mlp.luac
     lexer.lua gg.lua mlp_lexer.lua mlp_misc.lua mlp_table.lua mlp_meta.lua mlp_expr.lua mlp_stat.lua mlp_ext.lua
   WORKING_DIRECTORY ${SRC}/compiler )
 
+message ( STATUS "Bootstrap the parts of the compiler written in metalua" )
+
 execute_process (
-  COMMAND ${LUA} ${SRC}/build-utils/bootstrap.lua
-    ${SRC}/compiler/mlc.mlua output=${LIB}/metalua/mlc.luac
-  WORKING_DIRECTORY ${SRC}/lib )
+  COMMAND ${LUA} ${SRC}/build-utils/bootstrap.lua ${SRC}/compiler/mlc.mlua output=${LIB}/metalua/mlc.luac
+  COMMAND ${LUA} ${SRC}/build-utils/bootstrap.lua ${LIB}/metalua.mlua output=${LIB}/metalua.luac
+  WORKING_DIRECTORY ${LIB} )
 
+message ( STATUS "Finish the bootstrap: recompile the metalua parts of the compiler with itself" )
+  
 execute_process (
-  COMMAND ${LUA} ${SRC}/build-utils/bootstrap.lua
-    ${BIN}/metalua.mlua output=${LIB}/metalua.luac
-  WORKING_DIRECTORY ${SRC}/lib )
+  COMMAND ${LUA} ${LIB}/metalua.luac -vb -f ${SRC}/compiler/mlc.mlua -o ${LIB}/metalua/mlc.luac
+  COMMAND ${LUA} ${LIB}/metalua.luac -vb -f ${LIB}/metalua.mlua -o ${LIB}/metalua.luac
+  WORKING_DIRECTORY ${LIB} )
+
+message ( STATUS "Precompile metalua libraries" )
 
-# TODO:
-#call %DISTRIB_BIN%\metalua -vb -f compiler\mlc.mlua     -o %DISTRIB_LIB%\metalua\mlc.luac
-#call %DISTRIB_BIN%\metalua -vb -f compiler\metalua.mlua -o %DISTRIB_LIB%\metalua.luac
-#%LUA% %BASE%\build-utils\precompile.lua directory=%DISTRIB_LIB% command=%DISTRIB_BIN%\metalua
+file ( GLOB_RECURSE SRCS RELATIVE ${LIB} "${LIB}/*.mlua")
+foreach ( S ${SRCS} )
+  get_filename_component ( P ${S} PATH )
+  get_filename_component ( D ${S} NAME_WE )
+  message ( STATUS "Compiling ${S} to ${P}/${D}.luac" )
+  execute_process (
+    COMMAND ${LUA} ${LIB}/metalua.luac ${S} -o ${P}/${D}.luac
+    WORKING_DIRECTORY ${LIB} )
+endforeach ( S )
 
+install_lua_executable ( metalua ${LIB}/metalua.luac )
 install ( DIRECTORY ${LIB}/ DESTINATION ${INSTALL_LMOD} PATTERN "*.in" EXCLUDE)
-install_lua_executable ( metalua ${BIN}/lib/metalua.luac )
 install_doc ( doc/ )
 install_foo ( junk/ )
 install_data ( INSTALL.TXT README.TXT LICENSE )

src/compiler/metalua.mlua.in

@@ -1,6 +1,6 @@
 --*-lua-*- Set as a metalua file because it requires some metalua libs
 
-package.path = './?.luac;'..(_PROGDIR or "") .. "/@INSTALL_LMOD@/?.luac;"..package.path
+package.path = './?.luac;'..(_PROGDIR or "") .. "/../@INSTALL_LMOD@/?.luac;"..package.path
 
 --require 'verbose_require'