Merge pull request #6 from dumganhar/master

Refactor folder structure and add some tools.

Author: James Chen

.gitmodules

@@ -1,6 +1,12 @@
 [submodule "cocos2d-x"]
-	path = JSB/cocos2d-x
+	path = jsb/cocos2d-x
 	url = git://github.com/cocos2d/cocos2d-x.git
 [submodule "cocos2d-html5"]
 	path = cocos2d-html5
 	url = git://github.com/cocos2d/cocos2d-html5.git
+[submodule "tools/cocos2d-console"]
+	path = tools/cocos2d-console
+	url = git://github.com/cocos2d/cocos2d-console.git
+[submodule "tools/bindings-generator"]
+	path = tools/bindings-generator
+	url = git://github.com/cocos2d/bindings-generator.git

JSB/bindings/manual/proj.win32/libJSBinding.vcxproj.filters

@@ -39,6 +39,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,2d)
 $(call import-module,audio/android)

JSB/build/cocos2d_jsb_lib.xcodeproj/project.pbxproj

@@ -26,7 +26,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,extensions)
 $(call import-module,chipmunk)

JSB/project/proj.mac/main.cpp

@@ -24,6 +24,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/cocosbuilder)

JSB/bindings/Android.mk renamed to jsb/bindings/Android.mk

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/cocostudio)

JSB/bindings/auto/jsb_cocos2dx_auto.cpp renamed to jsb/bindings/auto/jsb_cocos2dx_auto.cpp

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_extension_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,extensions)

JSB/bindings/auto/jsb_cocos2dx_auto.hpp renamed to jsb/bindings/auto/jsb_cocos2dx_auto.hpp

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_gui_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,gui)

JSB/bindings/auto/jsb_cocos2dx_auto_api.js renamed to jsb/bindings/auto/jsb_cocos2dx_auto_api.js

@@ -24,6 +24,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += cocos_localstorage_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,storage/local-storage)

JSB/bindings/auto/jsb_cocos2dx_builder_auto.cpp renamed to jsb/bindings/auto/jsb_cocos2dx_builder_auto.cpp

@@ -24,7 +24,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES += websockets_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,network)
 $(call import-module,websockets/prebuilt/android)

JSB/bindings/auto/jsb_cocos2dx_builder_auto.hpp renamed to jsb/bindings/auto/jsb_cocos2dx_builder_auto.hpp

@@ -25,6 +25,6 @@ LOCAL_WHOLE_STATIC_LIBRARIES += spine_static
 
 include $(BUILD_STATIC_LIBRARY)
 
-$(call import-module,spidermonkey/prebuilt/android)
+$(call import-module,external/spidermonkey/prebuilt/android)
 $(call import-module,bindings)
 $(call import-module,editor-support/spine)