diff options
-rw-r--r-- | install.bat | 4 | ||||
-rw-r--r-- | src/luarocks/build/builtin.lua | 2 | ||||
-rw-r--r-- | src/luarocks/build/cmake.lua | 2 | ||||
-rw-r--r-- | src/luarocks/build/command.lua | 2 | ||||
-rw-r--r-- | src/luarocks/build/make.lua | 2 | ||||
-rw-r--r-- | src/luarocks/cmd/help.lua | 2 | ||||
-rw-r--r-- | src/luarocks/core/cfg.lua | 2 | ||||
-rw-r--r-- | src/luarocks/core/util.lua | 2 | ||||
-rw-r--r-- | src/luarocks/fs.lua | 2 | ||||
-rw-r--r-- | src/luarocks/fs/lua.lua | 6 | ||||
-rw-r--r-- | src/luarocks/fs/win32/tools.lua | 2 | ||||
-rw-r--r-- | src/luarocks/tools/patch.lua | 2 | ||||
-rw-r--r-- | win32/lua5.1/include/luaconf.h | 2 | ||||
-rw-r--r-- | win32/pe-parser.lua | 2 |
14 files changed, 17 insertions, 17 deletions
diff --git a/install.bat b/install.bat index 9aef7941..a98b32fd 100644 --- a/install.bat +++ b/install.bat | |||
@@ -520,7 +520,7 @@ local function get_msvc_env_setup_cmd() | |||
520 | end | 520 | end |
521 | 521 | ||
522 | -- try vcvarsall.bat in case MS changes the undocumented bat files above. | 522 | -- try vcvarsall.bat in case MS changes the undocumented bat files above. |
523 | -- but this way we don't konw if specified compiler is installed... | 523 | -- but this way we don't know if specified compiler is installed... |
524 | local vcvarsall = vcdir .. 'vcvarsall.bat' | 524 | local vcvarsall = vcdir .. 'vcvarsall.bat' |
525 | if exists(vcvarsall) then | 525 | if exists(vcvarsall) then |
526 | local vcvarsall_args = { x86 = "", x86_64 = " amd64" } | 526 | local vcvarsall_args = { x86 = "", x86_64 = " amd64" } |
@@ -1126,7 +1126,7 @@ end | |||
1126 | -- *********************************************************** | 1126 | -- *********************************************************** |
1127 | -- Cleanup | 1127 | -- Cleanup |
1128 | -- *********************************************************** | 1128 | -- *********************************************************** |
1129 | -- remove regsitry related files, no longer needed | 1129 | -- remove registry related files, no longer needed |
1130 | exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] ) | 1130 | exec( S[[del "$PREFIX\LuaRocks.reg.*" >NUL]] ) |
1131 | 1131 | ||
1132 | -- *********************************************************** | 1132 | -- *********************************************************** |
diff --git a/src/luarocks/build/builtin.lua b/src/luarocks/build/builtin.lua index f2b74399..9d8564b2 100644 --- a/src/luarocks/build/builtin.lua +++ b/src/luarocks/build/builtin.lua | |||
@@ -147,7 +147,7 @@ end | |||
147 | 147 | ||
148 | --- Driver function for the builtin build back-end. | 148 | --- Driver function for the builtin build back-end. |
149 | -- @param rockspec table: the loaded rockspec. | 149 | -- @param rockspec table: the loaded rockspec. |
150 | -- @return boolean or (nil, string): true if no errors ocurred, | 150 | -- @return boolean or (nil, string): true if no errors occurred, |
151 | -- nil and an error message otherwise. | 151 | -- nil and an error message otherwise. |
152 | function builtin.run(rockspec) | 152 | function builtin.run(rockspec) |
153 | assert(rockspec:type() == "rockspec") | 153 | assert(rockspec:type() == "rockspec") |
diff --git a/src/luarocks/build/cmake.lua b/src/luarocks/build/cmake.lua index e5db695c..0bf44dda 100644 --- a/src/luarocks/build/cmake.lua +++ b/src/luarocks/build/cmake.lua | |||
@@ -8,7 +8,7 @@ local cfg = require("luarocks.core.cfg") | |||
8 | 8 | ||
9 | --- Driver function for the "cmake" build back-end. | 9 | --- Driver function for the "cmake" build back-end. |
10 | -- @param rockspec table: the loaded rockspec. | 10 | -- @param rockspec table: the loaded rockspec. |
11 | -- @return boolean or (nil, string): true if no errors ocurred, | 11 | -- @return boolean or (nil, string): true if no errors occurred, |
12 | -- nil and an error message otherwise. | 12 | -- nil and an error message otherwise. |
13 | function cmake.run(rockspec) | 13 | function cmake.run(rockspec) |
14 | assert(rockspec:type() == "rockspec") | 14 | assert(rockspec:type() == "rockspec") |
diff --git a/src/luarocks/build/command.lua b/src/luarocks/build/command.lua index 2016de8b..755a39d2 100644 --- a/src/luarocks/build/command.lua +++ b/src/luarocks/build/command.lua | |||
@@ -8,7 +8,7 @@ local cfg = require("luarocks.core.cfg") | |||
8 | 8 | ||
9 | --- Driver function for the "command" build back-end. | 9 | --- Driver function for the "command" build back-end. |
10 | -- @param rockspec table: the loaded rockspec. | 10 | -- @param rockspec table: the loaded rockspec. |
11 | -- @return boolean or (nil, string): true if no errors ocurred, | 11 | -- @return boolean or (nil, string): true if no errors occurred, |
12 | -- nil and an error message otherwise. | 12 | -- nil and an error message otherwise. |
13 | function command.run(rockspec) | 13 | function command.run(rockspec) |
14 | assert(rockspec:type() == "rockspec") | 14 | assert(rockspec:type() == "rockspec") |
diff --git a/src/luarocks/build/make.lua b/src/luarocks/build/make.lua index 22b8628b..5df3050d 100644 --- a/src/luarocks/build/make.lua +++ b/src/luarocks/build/make.lua | |||
@@ -36,7 +36,7 @@ end | |||
36 | 36 | ||
37 | --- Driver function for the "make" build back-end. | 37 | --- Driver function for the "make" build back-end. |
38 | -- @param rockspec table: the loaded rockspec. | 38 | -- @param rockspec table: the loaded rockspec. |
39 | -- @return boolean or (nil, string): true if no errors ocurred, | 39 | -- @return boolean or (nil, string): true if no errors occurred, |
40 | -- nil and an error message otherwise. | 40 | -- nil and an error message otherwise. |
41 | function make.run(rockspec) | 41 | function make.run(rockspec) |
42 | assert(rockspec:type() == "rockspec") | 42 | assert(rockspec:type() == "rockspec") |
diff --git a/src/luarocks/cmd/help.lua b/src/luarocks/cmd/help.lua index d5423ed8..adcb9881 100644 --- a/src/luarocks/cmd/help.lua +++ b/src/luarocks/cmd/help.lua | |||
@@ -74,7 +74,7 @@ function help.command(description, commands, command) | |||
74 | print_section("VARIABLES") | 74 | print_section("VARIABLES") |
75 | util.printout([[ | 75 | util.printout([[ |
76 | Variables from the "variables" table of the configuration file | 76 | Variables from the "variables" table of the configuration file |
77 | can be overriden with VAR=VALUE assignments.]]) | 77 | can be overridden with VAR=VALUE assignments.]]) |
78 | print_section("COMMANDS") | 78 | print_section("COMMANDS") |
79 | for name, modname in util.sortedpairs(commands) do | 79 | for name, modname in util.sortedpairs(commands) do |
80 | local cmd = require(modname) | 80 | local cmd = require(modname) |
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua index f93e67a7..399912d5 100644 --- a/src/luarocks/core/cfg.lua +++ b/src/luarocks/core/cfg.lua | |||
@@ -137,7 +137,7 @@ do | |||
137 | end | 137 | end |
138 | 138 | ||
139 | -- Load config file and merge its contents into the `cfg` module table. | 139 | -- Load config file and merge its contents into the `cfg` module table. |
140 | -- @return filepath of succesfully loaded file or nil if it failed | 140 | -- @return filepath of successfully loaded file or nil if it failed |
141 | load_config_file = function(cfg, platforms, filepath) | 141 | load_config_file = function(cfg, platforms, filepath) |
142 | local result, err, errcode = persist.load_into_table(filepath, env_for_config_file(cfg, platforms)) | 142 | local result, err, errcode = persist.load_into_table(filepath, env_for_config_file(cfg, platforms)) |
143 | if (not result) and errcode ~= "open" then | 143 | if (not result) and errcode ~= "open" then |
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua index 8789851c..1499dc62 100644 --- a/src/luarocks/core/util.lua +++ b/src/luarocks/core/util.lua | |||
@@ -42,7 +42,7 @@ end | |||
42 | -- Formats tables with cycles recursively to any depth. | 42 | -- Formats tables with cycles recursively to any depth. |
43 | -- References to other tables are shown as values. | 43 | -- References to other tables are shown as values. |
44 | -- Self references are indicated. | 44 | -- Self references are indicated. |
45 | -- The string returned is "Lua code", which can be procesed | 45 | -- The string returned is "Lua code", which can be processed |
46 | -- (in the case in which indent is composed by spaces or "--"). | 46 | -- (in the case in which indent is composed by spaces or "--"). |
47 | -- Userdata and function keys and values are shown as strings, | 47 | -- Userdata and function keys and values are shown as strings, |
48 | -- which logically are exactly not equivalent to the original code. | 48 | -- which logically are exactly not equivalent to the original code. |
diff --git a/src/luarocks/fs.lua b/src/luarocks/fs.lua index ad439ccf..8122525e 100644 --- a/src/luarocks/fs.lua +++ b/src/luarocks/fs.lua | |||
@@ -64,7 +64,7 @@ do | |||
64 | end | 64 | end |
65 | 65 | ||
66 | if not cfg.each_platform then | 66 | if not cfg.each_platform then |
67 | error("cfg is not initalized, please run cfg.init() first") | 67 | error("cfg is not initialized, please run cfg.init() first") |
68 | end | 68 | end |
69 | 69 | ||
70 | -- Load platform-specific functions | 70 | -- Load platform-specific functions |
diff --git a/src/luarocks/fs/lua.lua b/src/luarocks/fs/lua.lua index 43a636fb..0976dc8d 100644 --- a/src/luarocks/fs/lua.lua +++ b/src/luarocks/fs/lua.lua | |||
@@ -291,7 +291,7 @@ function fs_lua.change_dir_to_root() | |||
291 | end | 291 | end |
292 | 292 | ||
293 | --- Change working directory to the previous in the dir stack. | 293 | --- Change working directory to the previous in the dir stack. |
294 | -- @return true if a pop ocurred, false if the stack was empty. | 294 | -- @return true if a pop occurred, false if the stack was empty. |
295 | function fs_lua.pop_dir() | 295 | function fs_lua.pop_dir() |
296 | local d = table.remove(dir_stack) | 296 | local d = table.remove(dir_stack) |
297 | if d then | 297 | if d then |
@@ -549,7 +549,7 @@ function fs_lua.find(at) | |||
549 | return result | 549 | return result |
550 | end | 550 | end |
551 | 551 | ||
552 | --- Test for existance of a file. | 552 | --- Test for existence of a file. |
553 | -- @param file string: filename to test | 553 | -- @param file string: filename to test |
554 | -- @return boolean: true if file exists, false otherwise. | 554 | -- @return boolean: true if file exists, false otherwise. |
555 | function fs_lua.exists(file) | 555 | function fs_lua.exists(file) |
@@ -1071,7 +1071,7 @@ function fs_lua.check_command_permissions(flags) | |||
1071 | end | 1071 | end |
1072 | 1072 | ||
1073 | --- Check whether a file is a Lua script | 1073 | --- Check whether a file is a Lua script |
1074 | -- When the file can be succesfully compiled by the configured | 1074 | -- When the file can be successfully compiled by the configured |
1075 | -- Lua interpreter, it's considered to be a valid Lua file. | 1075 | -- Lua interpreter, it's considered to be a valid Lua file. |
1076 | -- @param filename filename of file to check | 1076 | -- @param filename filename of file to check |
1077 | -- @return boolean true, if it is a Lua script, false otherwise | 1077 | -- @return boolean true, if it is a Lua script, false otherwise |
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua index 69512c9e..0fd73205 100644 --- a/src/luarocks/fs/win32/tools.lua +++ b/src/luarocks/fs/win32/tools.lua | |||
@@ -292,7 +292,7 @@ function tools.set_permissions(filename, mode, scope) | |||
292 | return true | 292 | return true |
293 | end | 293 | end |
294 | 294 | ||
295 | --- Test for existance of a file. | 295 | --- Test for existence of a file. |
296 | -- @param file string: filename to test | 296 | -- @param file string: filename to test |
297 | -- @return boolean: true if file exists, false otherwise. | 297 | -- @return boolean: true if file exists, false otherwise. |
298 | function tools.exists(file) | 298 | function tools.exists(file) |
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua index b46bd1d0..829df931 100644 --- a/src/luarocks/tools/patch.lua +++ b/src/luarocks/tools/patch.lua | |||
@@ -3,7 +3,7 @@ | |||
3 | -- http://lua-users.org/wiki/LuaPatch | 3 | -- http://lua-users.org/wiki/LuaPatch |
4 | -- | 4 | -- |
5 | -- (c) 2008 David Manura, Licensed under the same terms as Lua (MIT license). | 5 | -- (c) 2008 David Manura, Licensed under the same terms as Lua (MIT license). |
6 | -- Code is heavilly based on the Python-based patch.py version 8.06-1 | 6 | -- Code is heavily based on the Python-based patch.py version 8.06-1 |
7 | -- Copyright (c) 2008 rainforce.org, MIT License | 7 | -- Copyright (c) 2008 rainforce.org, MIT License |
8 | -- Project home: http://code.google.com/p/python-patch/ . | 8 | -- Project home: http://code.google.com/p/python-patch/ . |
9 | -- Version 0.1 | 9 | -- Version 0.1 |
diff --git a/win32/lua5.1/include/luaconf.h b/win32/lua5.1/include/luaconf.h index 05354175..47bad73f 100644 --- a/win32/lua5.1/include/luaconf.h +++ b/win32/lua5.1/include/luaconf.h | |||
@@ -47,7 +47,7 @@ | |||
47 | 47 | ||
48 | 48 | ||
49 | /* | 49 | /* |
50 | @@ LUA_USE_POSIX includes all functionallity listed as X/Open System | 50 | @@ LUA_USE_POSIX includes all functionality listed as X/Open System |
51 | @* Interfaces Extension (XSI). | 51 | @* Interfaces Extension (XSI). |
52 | ** CHANGE it (define it) if your system is XSI compatible. | 52 | ** CHANGE it (define it) if your system is XSI compatible. |
53 | */ | 53 | */ |
diff --git a/win32/pe-parser.lua b/win32/pe-parser.lua index 34556812..1aff7107 100644 --- a/win32/pe-parser.lua +++ b/win32/pe-parser.lua | |||
@@ -416,7 +416,7 @@ M.parse = function(target) | |||
416 | name = "Characteristics"}, | 416 | name = "Characteristics"}, |
417 | }, f) | 417 | }, f) |
418 | end | 418 | end |
419 | -- we now have section data, so add RVA convertion method | 419 | -- we now have section data, so add RVA conversion method |
420 | out.get_fileoffset = M.get_fileoffset | 420 | out.get_fileoffset = M.get_fileoffset |
421 | 421 | ||
422 | -- get the import table | 422 | -- get the import table |