Merge branch 'develop'

Author: dualface

README.md

@@ -79,7 +79,6 @@ Common:
 - add CCNotificationCenter Lua support
 - CCLuaEngine:executeLayerKeypadEvent() use "back", "menu" for keypad events
 - add Lua global function CCLuaLoadChunksFromZIP()
-- add Lua global function typen() for faster type check, and constants LUA\_TNIL, LUA\_TBOOLEAN, LUA\_TLIGHTUSERDATA, LUA\_TNUMBER, LUA\_TSTRING, LUA\_TTABLE, LUA\_TFUNCTION, LUA\_TUSERDATA, LUA\_TTHREAD
 - add Lua global function CCLuaStackSnapshot, get Lua state snapshot
 - upgrade LuaJIT to 2.0.2
 - add LuaJavaBridge

bin/lib/compile_luabinding_functions.php

@@ -179,7 +179,9 @@ function build()
         }
         $macros = implode(' ', $macros);
 
-        $command = sprintf('"%s" %s -L "%s" -o "%s" "%s"', TOLUA_BIN, $macros, CONFIG_PATH, $this->outputSourcePath_, $this->inputPath_);
+        chdir(dirname($this->inputPath_));
+        $inputFilename = pathinfo($this->inputPath_, PATHINFO_BASENAME);
+        $command = sprintf('"%s" %s -L "%s" -o "%s" "%s"', TOLUA_BIN, $macros, CONFIG_PATH, $this->outputSourcePath_, $inputFilename);
         printf("\ncommand: %s\n\n", $command);
 
         printf("creating file: %s\n\n", $this->outputSourcePath_);
@@ -320,7 +322,7 @@ function long2str($v, $w) {
 }
 
 function str2long($s, $w) {
-    $v = unpack("V*", $s. str_repeat("\0", (4 - strlen($s) % 4) & 3));
+    $v = unpack("V*", $s . str_repeat("\0", (4 - strlen($s) % 4) & 3));
     $v = array_values($v);
     if ($w) {
         $v[count($v)] = strlen($s);