Skip to content

Commit d689e2b

Browse files
committed
Build luajit-rocks
Microsoft Windows 8.1 Enterprise, 6.3.9600 Build 9600 Intel(R) Core(TM) i5-2500 CPU @ 3.30GHz, 3301 Mhz, 4 Core(s), 4 Logical Processor(s) Toolchain: Microsoft Visual Studio Community 2015, Version 14.0.25431.01 Update 3 Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24215.1 for x64 Microsoft (R) Incremental Linker Version 14.00.24215.1 ---- set TORCH_INSTALL_PATH=C:/torch git clone https://github.com/torch/luajit-rocks.git cd luajit-rocks git rev-parse HEAD &:: 2c7496b905f6f972673effda4884766433b7583b REM Store the LUAJIT-ROCKS PATCH found at the end of this script in file 'p' git apply p mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=%TORCH_INSTALL_PATH% -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DWITH_LUAJIT21=ON nmake cmake -DCMAKE_INSTALL_PREFIX=%TORCH_INSTALL_PATH% -G "NMake Makefiles" -P cmake_install.cmake -DCMAKE_BUILD_TYPE=Release -DWITH_LUAJIT21=ON ---- LUAJIT-ROCKS PATCH BEGIN ---- diff --git a/luajit-2.1/CMakeLists.txt b/luajit-2.1/CMakeLists.txt index 0df51e9..2637390 100644 --- a/luajit-2.1/CMakeLists.txt +++ b/luajit-2.1/CMakeLists.txt @@ -22,10 +22,10 @@ OPTION(WITH_AMALG "Build eveything in one shot (needs memory)" ON) SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") IF(WIN32) - SET(INSTALL_BIN_SUBDIR "." CACHE STRING "installation executable subdirectory name") - SET(INSTALL_LIB_SUBDIR "." CACHE STRING "installation library subdirectory name") + SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") + SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_LUA_PATH_SUBDIR "lua") # not editable - SET(INSTALL_LUA_CPATH_SUBDIR ".") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR "bin") # not editable ELSE() SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") diff --git a/luarocks/CMakeLists.txt b/luarocks/CMakeLists.txt index a77199b..4c4ebed 100644 --- a/luarocks/CMakeLists.txt +++ b/luarocks/CMakeLists.txt @@ -5,10 +5,10 @@ CMAKE_POLICY(VERSION 2.6) SET(INSTALL_INCLUDE_SUBDIR "include" CACHE STRING "installation include subdirectory name") IF(WIN32) - SET(INSTALL_BIN_SUBDIR "." CACHE STRING "installation executable subdirectory name") - SET(INSTALL_LIB_SUBDIR "." CACHE STRING "installation library subdirectory name") + SET(INSTALL_BIN_SUBDIR "bin" CACHE STRING "installation executable subdirectory name") + SET(INSTALL_LIB_SUBDIR "lib" CACHE STRING "installation library subdirectory name") SET(INSTALL_LUA_PATH_SUBDIR "lua") # not editable - SET(INSTALL_LUA_CPATH_SUBDIR ".") # not editable + SET(INSTALL_LUA_CPATH_SUBDIR "bin") # not editable SET(INSTALL_LUAROCKS_ROCKS_SUBDIR "luarocks" CACHE STRING "installation luarocks rocks subdirectory name") SET(INSTALL_LUAROCKS_SYSCONF_SUBDIR "luarocks" CACHE STRING "installation luarocks sysconfig subdirectory name") ELSE() @@ -30,7 +30,7 @@ IF(WIN32) win32/tools/7z.dll win32/tools/libeay32.dll win32/tools/libiconv2.dll win32/tools/libintl3.dll win32/tools/libssl32.dll) - INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") + INSTALL(FILES ${WINUTILS_DLL_FILES} DESTINATION "./tools/") SET(WINUTILS_EXE_FILES win32/tools/7z.exe @@ -49,7 +49,7 @@ IF(WIN32) win32/tools/uname.exe win32/tools/wget.exe) - INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "${INSTALL_BIN_SUBDIR}/tools/") + INSTALL(PROGRAMS ${WINUTILS_EXE_FILES} DESTINATION "./tools/") SET(WGET_EXECUTABLE_NAME "wget") SET(MD5_EXECUTABLE_NAME "md5sum") ---- LUAJIT-ROCKS PATCH END ---- Build configuration: -- The C compiler identification is MSVC 19.0.24215.1 -- The CXX compiler identification is MSVC 19.0.24215.1 -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Check for working C compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- works -- Detecting C compiler ABI info -- Detecting C compiler ABI info - done -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Check for working CXX compiler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- works -- Detecting CXX compiler ABI info -- Detecting CXX compiler ABI info - done -- Detecting CXX compile features -- Detecting CXX compile features - done -- The ASM compiler identification is MSVC -- Found assembler: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/bin/amd64/cl.exe -- Warning: Did not find file Compiler/MSVC-ASM -- Looking for sys/types.h -- Looking for sys/types.h - found -- Looking for stdint.h -- Looking for stdint.h - found -- Looking for stddef.h -- Looking for stddef.h - found -- Check size of void* -- Check size of void* - done -- Looking for sin in m -- Looking for sin in m - not found -- Looking for printw in ncurses -- Looking for printw in ncurses - not found -- Looking for pthread.h -- Looking for pthread.h - not found -- Found Threads: TRUE -- Performing Test LJ_TARGET_X64 -- Performing Test LJ_TARGET_X64 - Success -- LuaJIT Target: x64 -- Performing Test LJ_LE_1 -- Performing Test LJ_LE_1 - Success -- Performing Test LJ_ARCH_BITS_64 -- Performing Test LJ_ARCH_BITS_64 - Success -- Performing Test LJ_HASJIT_1 -- Performing Test LJ_HASJIT_1 - Success -- Performing Test LJ_HASFFI_1 -- Performing Test LJ_HASFFI_1 - Success -- Performing Test LJ_DUALNUM_1 -- Performing Test LJ_DUALNUM_1 - Failed -- Performing Test LJ_ARCH_HASFPU_1 -- Performing Test LJ_ARCH_HASFPU_1 - Success -- Performing Test LJ_ABI_SOFTFP_1 -- Performing Test LJ_ABI_SOFTFP_1 - Failed -- Performing Test LJ_NO_UNWIND_1 -- Performing Test LJ_NO_UNWIND_1 - Failed -- Performing Test LJ_FR2_1 -- Performing Test LJ_FR2_1 - Success -- Looking for sin in m -- Looking for sin in m - not found
1 parent 5be0d16 commit d689e2b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+19340
-0
lines changed

bin/libluajit.dll

526 KB
Binary file not shown.

bin/luajit.exe

20.5 KB
Binary file not shown.

bin/luarocks-admin.bat

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
::rem:: --[[
2+
@setlocal& set PATH=C:/torch/bin;%PATH% & set luafile="%~f0" & if exist "%~f0.bat" set luafile="%~f0.bat"
3+
@C:/torch/bin/luajit.exe %luafile% %*& exit /b ]]
4+
5+
package.path = [[C:/torch/lua/?.lua;C:/torch/lua/?/init.lua;]]..package.path
6+
7+
-- this should be loaded first.
8+
local cfg = require("luarocks.cfg")
9+
10+
local loader = require("luarocks.loader")
11+
local command_line = require("luarocks.command_line")
12+
13+
program_description = "LuaRocks repository administration interface"
14+
15+
commands = {
16+
help = "luarocks.help",
17+
make_manifest = "luarocks.make_manifest",
18+
add = "luarocks.add",
19+
remove = "luarocks.admin_remove",
20+
refresh_cache = "luarocks.refresh_cache",
21+
}
22+
23+
command_line.run_command(...)

bin/luarocks.bat

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
::rem:: --[[
2+
@setlocal& set PATH=C:/torch/bin;%PATH% & set luafile="%~f0" & if exist "%~f0.bat" set luafile="%~f0.bat"
3+
@C:/torch/bin/luajit.exe %luafile% %*& exit /b ]]
4+
5+
package.path = [[C:/torch/lua/?.lua;C:/torch/lua/?/init.lua;]]..package.path
6+
7+
-- this should be loaded first.
8+
local cfg = require("luarocks.cfg")
9+
10+
local loader = require("luarocks.loader")
11+
local command_line = require("luarocks.command_line")
12+
13+
program_description = "LuaRocks main command-line interface"
14+
15+
commands = {
16+
help = "luarocks.help",
17+
pack = "luarocks.pack",
18+
unpack = "luarocks.unpack",
19+
build = "luarocks.build",
20+
install = "luarocks.install",
21+
search = "luarocks.search",
22+
list = "luarocks.list",
23+
remove = "luarocks.remove",
24+
make = "luarocks.make",
25+
download = "luarocks.download",
26+
path = "luarocks.path_cmd",
27+
show = "luarocks.show",
28+
new_version = "luarocks.new_version",
29+
lint = "luarocks.lint",
30+
write_rockspec = "luarocks.write_rockspec",
31+
purge = "luarocks.purge",
32+
doc = "luarocks.doc",
33+
upload = "luarocks.upload",
34+
config = "luarocks.config_cmd",
35+
}
36+
37+
command_line.run_command(...)

include/lauxlib.h

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
/*
2+
** $Id: lauxlib.h,v 1.88.1.1 2007/12/27 13:02:25 roberto Exp $
3+
** Auxiliary functions for building Lua libraries
4+
** See Copyright Notice in lua.h
5+
*/
6+
7+
8+
#ifndef lauxlib_h
9+
#define lauxlib_h
10+
11+
12+
#include <stddef.h>
13+
#include <stdio.h>
14+
15+
#include "lua.h"
16+
17+
18+
/* extra error code for `luaL_load' */
19+
#define LUA_ERRFILE (LUA_ERRERR+1)
20+
21+
typedef struct luaL_Reg {
22+
const char *name;
23+
lua_CFunction func;
24+
} luaL_Reg;
25+
26+
LUALIB_API void (luaL_openlib) (lua_State *L, const char *libname,
27+
const luaL_Reg *l, int nup);
28+
LUALIB_API void (luaL_register) (lua_State *L, const char *libname,
29+
const luaL_Reg *l);
30+
LUALIB_API int (luaL_getmetafield) (lua_State *L, int obj, const char *e);
31+
LUALIB_API int (luaL_callmeta) (lua_State *L, int obj, const char *e);
32+
LUALIB_API int (luaL_typerror) (lua_State *L, int narg, const char *tname);
33+
LUALIB_API int (luaL_argerror) (lua_State *L, int numarg, const char *extramsg);
34+
LUALIB_API const char *(luaL_checklstring) (lua_State *L, int numArg,
35+
size_t *l);
36+
LUALIB_API const char *(luaL_optlstring) (lua_State *L, int numArg,
37+
const char *def, size_t *l);
38+
LUALIB_API lua_Number (luaL_checknumber) (lua_State *L, int numArg);
39+
LUALIB_API lua_Number (luaL_optnumber) (lua_State *L, int nArg, lua_Number def);
40+
41+
LUALIB_API lua_Integer (luaL_checkinteger) (lua_State *L, int numArg);
42+
LUALIB_API lua_Integer (luaL_optinteger) (lua_State *L, int nArg,
43+
lua_Integer def);
44+
45+
LUALIB_API void (luaL_checkstack) (lua_State *L, int sz, const char *msg);
46+
LUALIB_API void (luaL_checktype) (lua_State *L, int narg, int t);
47+
LUALIB_API void (luaL_checkany) (lua_State *L, int narg);
48+
49+
LUALIB_API int (luaL_newmetatable) (lua_State *L, const char *tname);
50+
LUALIB_API void *(luaL_checkudata) (lua_State *L, int ud, const char *tname);
51+
52+
LUALIB_API void (luaL_where) (lua_State *L, int lvl);
53+
LUALIB_API int (luaL_error) (lua_State *L, const char *fmt, ...);
54+
55+
LUALIB_API int (luaL_checkoption) (lua_State *L, int narg, const char *def,
56+
const char *const lst[]);
57+
58+
/* pre-defined references */
59+
#define LUA_NOREF (-2)
60+
#define LUA_REFNIL (-1)
61+
62+
LUALIB_API int (luaL_ref) (lua_State *L, int t);
63+
LUALIB_API void (luaL_unref) (lua_State *L, int t, int ref);
64+
65+
LUALIB_API int (luaL_loadfile) (lua_State *L, const char *filename);
66+
LUALIB_API int (luaL_loadbuffer) (lua_State *L, const char *buff, size_t sz,
67+
const char *name);
68+
LUALIB_API int (luaL_loadstring) (lua_State *L, const char *s);
69+
70+
LUALIB_API lua_State *(luaL_newstate) (void);
71+
72+
73+
LUALIB_API const char *(luaL_gsub) (lua_State *L, const char *s, const char *p,
74+
const char *r);
75+
76+
LUALIB_API const char *(luaL_findtable) (lua_State *L, int idx,
77+
const char *fname, int szhint);
78+
79+
/* From Lua 5.2. */
80+
LUALIB_API int luaL_fileresult(lua_State *L, int stat, const char *fname);
81+
LUALIB_API int luaL_execresult(lua_State *L, int stat);
82+
LUALIB_API int (luaL_loadfilex) (lua_State *L, const char *filename,
83+
const char *mode);
84+
LUALIB_API int (luaL_loadbufferx) (lua_State *L, const char *buff, size_t sz,
85+
const char *name, const char *mode);
86+
LUALIB_API void luaL_traceback (lua_State *L, lua_State *L1, const char *msg,
87+
int level);
88+
LUALIB_API void (luaL_setfuncs) (lua_State *L, const luaL_Reg *l, int nup);
89+
LUALIB_API void (luaL_pushmodule) (lua_State *L, const char *modname,
90+
int sizehint);
91+
LUALIB_API void *(luaL_testudata) (lua_State *L, int ud, const char *tname);
92+
LUALIB_API void (luaL_setmetatable) (lua_State *L, const char *tname);
93+
94+
95+
/*
96+
** ===============================================================
97+
** some useful macros
98+
** ===============================================================
99+
*/
100+
101+
#define luaL_argcheck(L, cond,numarg,extramsg) \
102+
((void)((cond) || luaL_argerror(L, (numarg), (extramsg))))
103+
#define luaL_checkstring(L,n) (luaL_checklstring(L, (n), NULL))
104+
#define luaL_optstring(L,n,d) (luaL_optlstring(L, (n), (d), NULL))
105+
#define luaL_checkint(L,n) ((int)luaL_checkinteger(L, (n)))
106+
#define luaL_optint(L,n,d) ((int)luaL_optinteger(L, (n), (d)))
107+
#define luaL_checklong(L,n) ((long)luaL_checkinteger(L, (n)))
108+
#define luaL_optlong(L,n,d) ((long)luaL_optinteger(L, (n), (d)))
109+
110+
#define luaL_typename(L,i) lua_typename(L, lua_type(L,(i)))
111+
112+
#define luaL_dofile(L, fn) \
113+
(luaL_loadfile(L, fn) || lua_pcall(L, 0, LUA_MULTRET, 0))
114+
115+
#define luaL_dostring(L, s) \
116+
(luaL_loadstring(L, s) || lua_pcall(L, 0, LUA_MULTRET, 0))
117+
118+
#define luaL_getmetatable(L,n) (lua_getfield(L, LUA_REGISTRYINDEX, (n)))
119+
120+
#define luaL_opt(L,f,n,d) (lua_isnoneornil(L,(n)) ? (d) : f(L,(n)))
121+
122+
/* From Lua 5.2. */
123+
#define luaL_newlibtable(L, l) \
124+
lua_createtable(L, 0, sizeof(l)/sizeof((l)[0]) - 1)
125+
#define luaL_newlib(L, l) (luaL_newlibtable(L, l), luaL_setfuncs(L, l, 0))
126+
127+
/*
128+
** {======================================================
129+
** Generic Buffer manipulation
130+
** =======================================================
131+
*/
132+
133+
134+
135+
typedef struct luaL_Buffer {
136+
char *p; /* current position in buffer */
137+
int lvl; /* number of strings in the stack (level) */
138+
lua_State *L;
139+
char buffer[LUAL_BUFFERSIZE];
140+
} luaL_Buffer;
141+
142+
#define luaL_addchar(B,c) \
143+
((void)((B)->p < ((B)->buffer+LUAL_BUFFERSIZE) || luaL_prepbuffer(B)), \
144+
(*(B)->p++ = (char)(c)))
145+
146+
/* compatibility only */
147+
#define luaL_putchar(B,c) luaL_addchar(B,c)
148+
149+
#define luaL_addsize(B,n) ((B)->p += (n))
150+
151+
LUALIB_API void (luaL_buffinit) (lua_State *L, luaL_Buffer *B);
152+
LUALIB_API char *(luaL_prepbuffer) (luaL_Buffer *B);
153+
LUALIB_API void (luaL_addlstring) (luaL_Buffer *B, const char *s, size_t l);
154+
LUALIB_API void (luaL_addstring) (luaL_Buffer *B, const char *s);
155+
LUALIB_API void (luaL_addvalue) (luaL_Buffer *B);
156+
LUALIB_API void (luaL_pushresult) (luaL_Buffer *B);
157+
158+
159+
/* }====================================================== */
160+
161+
#endif

0 commit comments

Comments
 (0)