Skip to content

issue #2823: [JSB] Support remote debugging JSB project by FireFox. #3912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Oct 10, 2013
Merged

issue #2823: [JSB] Support remote debugging JSB project by FireFox. #3912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
02510f1
issue #2823: firefox remote connection ok.
Oct 5, 2013
6772715
issue #2823: comment some test codes.
Oct 5, 2013
1dbb747
issue #2823: load js file in firefox.
Oct 7, 2013
226ff2b
issue #2823: firefox debugger step ok.
Oct 7, 2013
6a0404a
issue #2823: debugger loading js source with utf8 is ok.
Oct 7, 2013
9f80abb
issue #2823: Moving 'utf16to8' to DevToolsUtils.js and adding 'utf8to…
Oct 7, 2013
3ab8e47
issue #2823: Fixing mess code when modifying the value of variables w…
Oct 7, 2013
326ba91
issue #2823: Removing unused codes in jsb_debugger.js.
Oct 7, 2013
a5ca24a
issue #2823: Removing unused file 'main.debug.js'.
Oct 8, 2013
5f992b9
issue #2823: minor fix and logs.
Oct 8, 2013
c5a99e5
issue #2823: Fix socket errors on WINDOWS.
Oct 8, 2013
03b3730
issue #2823: _lockVM take no arguments now.
Oct 8, 2013
b3a17ba
issue #2823: Renaming '_lockVM' to '_enterNestedEventLoop', '_unlockV…
Oct 9, 2013
4b6244c
issue #2823: Reverting script.js.
Oct 9, 2013
9d45580
issue #2823: Adding XPCInspector support in debugger/main.js.
Oct 9, 2013
caa46f6
issue #2823: Removing some log outputs in transport.js.
Oct 9, 2013
ba5e625
issue #2823: Removing unused conversion.
Oct 9, 2013
1d658a7
issue #2823: Updating webconsole.js and loading webconsole.js in jsb_…
Oct 9, 2013
04b34b1
issue #2823: Reverting CCFileUtils.cpp.
Oct 10, 2013
4b7494a
issue #2823: Removing unused debugger codes in MoonWarriors/Classes/A…
Oct 10, 2013
cd0edc3
issue #2823: Removing unused js files in 'js/debugger' folder.
Oct 10, 2013
0d0e588
issue #2823: Removing some codes for debugging in ScriptingCore.h/.cpp.
Oct 10, 2013
94323fc
issue #2823: Reverting ScriptingCore.cpp for Spidermonkey v23.
Oct 10, 2013
a81c3d1
issue #2823: Removing loading web console.js in jsb_debugger.js.
Oct 10, 2013
1926fc3
issue #2823: Adding README.md.
Oct 10, 2013
dffefc7
issue #2823: Enabling JSB debugger in debug mode. Removing the defini…
Oct 10, 2013
9451e69
issue #2823: Updating build_native.sh for JSB projects. Copy all reso…
Oct 10, 2013
8a743c5
issue #2823: Updating build_native.sh for AssetsMangerTest.
Oct 10, 2013
425dc9d
issue #2823: Removing unused codes of debugger.
Oct 10, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 2 additions & 38 deletions cocos2d_libs.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,6 @@
1A11982A1785388100D62A44 /* tolua_map.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A1196981785201F00D62A44 /* tolua_map.c */; };
1A11982B1785388100D62A44 /* tolua_push.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A1196991785201F00D62A44 /* tolua_push.c */; };
1A11982C1785388100D62A44 /* tolua_to.c in Sources */ = {isa = PBXBuildFile; fileRef = 1A11969A1785201F00D62A44 /* tolua_to.c */; };
1A2E82381793EDB70058E421 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = 1A2E82371793EDB70058E421 /* jsb_deprecated.js */; };
1A2E82391793EDB70058E421 /* jsb_deprecated.js in Sources */ = {isa = PBXBuildFile; fileRef = 1A2E82371793EDB70058E421 /* jsb_deprecated.js */; };
1A50FEA517A0C89300A422C8 /* CCDeprecated-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A50FEA417A0C89300A422C8 /* CCDeprecated-ext.h */; };
1A50FEA617A0C89300A422C8 /* CCDeprecated-ext.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A50FEA417A0C89300A422C8 /* CCDeprecated-ext.h */; };
1A6CC67B17E07C89006DEE69 /* CCEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6CC66117E07C89006DEE69 /* CCEvent.cpp */; };
Expand Down Expand Up @@ -2366,7 +2364,7 @@
1A1196991785201F00D62A44 /* tolua_push.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tolua_push.c; sourceTree = "<group>"; };
1A11969A1785201F00D62A44 /* tolua_to.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tolua_to.c; sourceTree = "<group>"; };
1A119791178526AA00D62A44 /* libluabindings iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libluabindings iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1A2E82371793EDB70058E421 /* jsb_deprecated.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_deprecated.js; sourceTree = "<group>"; };
1A2B004118025936009E8C43 /* js */ = {isa = PBXFileReference; lastKnownFileType = folder; path = js; sourceTree = "<group>"; };
1A50FEA417A0C89300A422C8 /* CCDeprecated-ext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CCDeprecated-ext.h"; sourceTree = "<group>"; };
1A6CC66117E07C89006DEE69 /* CCEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCEvent.cpp; sourceTree = "<group>"; };
1A6CC66217E07C89006DEE69 /* CCEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEvent.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3138,18 +3136,6 @@
A03F320617814803006731B9 /* cocos2d_specifics.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cocos2d_specifics.hpp; sourceTree = "<group>"; };
A03F320717814803006731B9 /* cocosjs_manual_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocosjs_manual_conversions.cpp; sourceTree = "<group>"; };
A03F320817814803006731B9 /* cocosjs_manual_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocosjs_manual_conversions.h; sourceTree = "<group>"; };
A03F321217814803006731B9 /* jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb.js; sourceTree = "<group>"; };
A03F321317814803006731B9 /* jsb_chipmunk.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_chipmunk.js; sourceTree = "<group>"; };
A03F321417814803006731B9 /* jsb_chipmunk_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_chipmunk_constants.js; sourceTree = "<group>"; };
A03F321517814803006731B9 /* jsb_cocos2d.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_cocos2d.js; sourceTree = "<group>"; };
A03F321617814803006731B9 /* jsb_cocos2d_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_cocos2d_constants.js; sourceTree = "<group>"; };
A03F321717814803006731B9 /* jsb_cocos2d_extension.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_cocos2d_extension.js; sourceTree = "<group>"; };
A03F321817814803006731B9 /* jsb_cocosbuilder.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_cocosbuilder.js; sourceTree = "<group>"; };
A03F321917814803006731B9 /* jsb_debugger.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_debugger.js; sourceTree = "<group>"; };
A03F321A17814803006731B9 /* jsb_opengl.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_opengl.js; sourceTree = "<group>"; };
A03F321B17814803006731B9 /* jsb_opengl_constants.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_opengl_constants.js; sourceTree = "<group>"; };
A03F321C17814803006731B9 /* jsb_sys.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = jsb_sys.js; sourceTree = "<group>"; };
A03F321D17814803006731B9 /* main.debug.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = main.debug.js; sourceTree = "<group>"; };
A03F321E17814803006731B9 /* js_bindings_ccbreader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_ccbreader.cpp; sourceTree = "<group>"; };
A03F321F17814803006731B9 /* js_bindings_ccbreader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = js_bindings_ccbreader.h; sourceTree = "<group>"; };
A03F322017814803006731B9 /* js_bindings_chipmunk_auto_classes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = js_bindings_chipmunk_auto_classes.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -5438,12 +5424,12 @@
A03F320317814803006731B9 /* bindings */ = {
isa = PBXGroup;
children = (
1A2B004118025936009E8C43 /* js */,
A03F320417814803006731B9 /* Android.mk */,
A03F320517814803006731B9 /* cocos2d_specifics.cpp */,
A03F320617814803006731B9 /* cocos2d_specifics.hpp */,
A03F320717814803006731B9 /* cocosjs_manual_conversions.cpp */,
A03F320817814803006731B9 /* cocosjs_manual_conversions.h */,
A03F321117814803006731B9 /* js */,
A03F321E17814803006731B9 /* js_bindings_ccbreader.cpp */,
A03F321F17814803006731B9 /* js_bindings_ccbreader.h */,
A03F322017814803006731B9 /* js_bindings_chipmunk_auto_classes.cpp */,
Expand Down Expand Up @@ -5489,26 +5475,6 @@
path = bindings;
sourceTree = "<group>";
};
A03F321117814803006731B9 /* js */ = {
isa = PBXGroup;
children = (
A03F321217814803006731B9 /* jsb.js */,
A03F321317814803006731B9 /* jsb_chipmunk.js */,
A03F321417814803006731B9 /* jsb_chipmunk_constants.js */,
A03F321517814803006731B9 /* jsb_cocos2d.js */,
A03F321617814803006731B9 /* jsb_cocos2d_constants.js */,
A03F321717814803006731B9 /* jsb_cocos2d_extension.js */,
A03F321817814803006731B9 /* jsb_cocosbuilder.js */,
A03F321917814803006731B9 /* jsb_debugger.js */,
A03F321A17814803006731B9 /* jsb_opengl.js */,
A03F321B17814803006731B9 /* jsb_opengl_constants.js */,
A03F321C17814803006731B9 /* jsb_sys.js */,
A03F321D17814803006731B9 /* main.debug.js */,
1A2E82371793EDB70058E421 /* jsb_deprecated.js */,
);
path = js;
sourceTree = "<group>";
};
A03F324117814803006731B9 /* obfuscate */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -8409,7 +8375,6 @@
A03F33BD17814804006731B9 /* jsb_websocket.cpp in Sources */,
A03F33C317814804006731B9 /* ScriptingCore.cpp in Sources */,
A03F33C617814804006731B9 /* XMLHTTPRequest.cpp in Sources */,
1A2E82381793EDB70058E421 /* jsb_deprecated.js in Sources */,
1ADB26ED17CC92D200634B5E /* jsb_cocos2dx_auto.cpp in Sources */,
1ADB26F917CC92D200634B5E /* jsb_cocos2dx_extension_auto.cpp in Sources */,
);
Expand Down Expand Up @@ -8851,7 +8816,6 @@
A07A4FC9178387750073F6A7 /* jsb_websocket.cpp in Sources */,
A07A4FCA178387750073F6A7 /* ScriptingCore.cpp in Sources */,
A07A4FCB178387750073F6A7 /* XMLHTTPRequest.cpp in Sources */,
1A2E82391793EDB70058E421 /* jsb_deprecated.js in Sources */,
1ADB26EF17CC92D200634B5E /* jsb_cocos2dx_auto.cpp in Sources */,
1ADB26FB17CC92D200634B5E /* jsb_cocos2dx_extension_auto.cpp in Sources */,
);
Expand Down
2 changes: 1 addition & 1 deletion samples/Cpp/AssetsManagerTest/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fi
done

# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets

# copy icons (if they exist)
file="$APP_ANDROID_ROOT"/assets/Icon-72.png
Expand Down
4 changes: 4 additions & 0 deletions samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ bool AppDelegate::applicationDidFinishLaunching()

sc->start();

#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif

js_log("RUNNING Main");
auto pEngine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
Expand Down
2 changes: 1 addition & 1 deletion samples/Javascript/CocosDragonJS/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ mkdir "$APP_ANDROID_ROOT"/assets
cp -rf "$RESROUCE_ROOT"/* "$APP_ANDROID_ROOT"/assets

# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets

echo "Using prebuilt externals"
echo
Expand Down
4 changes: 4 additions & 0 deletions samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ bool AppDelegate::applicationDidFinishLaunching()

sc->start();

#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif

js_log("RUNNING Main");
auto pEngine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
Expand Down
2 changes: 1 addition & 1 deletion samples/Javascript/CrystalCraze/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ mkdir "$APP_ANDROID_ROOT"/assets
cp -rf "$RESROUCE_ROOT"/* "$APP_ANDROID_ROOT"/assets

# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets


echo "Using prebuilt externals"
Expand Down
11 changes: 7 additions & 4 deletions samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ bool AppDelegate::applicationDidFinishLaunching()
// set FPS. the default value is 1.0/60 if you don't call this
pDirector->setAnimationInterval(1.0 / 60);

FileUtils::getInstance()->addSearchPath("js");

ScriptingCore* sc = ScriptingCore::getInstance();
sc->addRegisterCallback(register_all_cocos2dx);
sc->addRegisterCallback(register_all_cocos2dx_extension);
Expand All @@ -52,13 +54,14 @@ bool AppDelegate::applicationDidFinishLaunching()

sc->start();

#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif

auto pEngine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
#if JSB_ENABLE_DEBUGGER
ScriptingCore::getInstance()->runScript("main.debug.js");
#else

ScriptingCore::getInstance()->runScript("MoonWarriors-jsb.js");
#endif

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion samples/Javascript/MoonWarriors/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ cp -rf "$RESROUCE_ROOT"/../src "$APP_ANDROID_ROOT"/assets
cp "$RESROUCE_ROOT"/../*.js "$APP_ANDROID_ROOT"/assets

# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets


echo "Using prebuilt externals"
Expand Down
9 changes: 7 additions & 2 deletions samples/Javascript/TestJavascript/Classes/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ bool AppDelegate::applicationDidFinishLaunching()
// set FPS. the default value is 1.0/60 if you don't call this
pDirector->setAnimationInterval(1.0 / 60);

FileUtils::getInstance()->addSearchPath("res");
FileUtils::getInstance()->addSearchPath("js");

ScriptingCore* sc = ScriptingCore::getInstance();
sc->addRegisterCallback(register_all_cocos2dx);
sc->addRegisterCallback(register_all_cocos2dx_extension);
Expand All @@ -54,8 +57,10 @@ bool AppDelegate::applicationDidFinishLaunching()
sc->addRegisterCallback(register_CCBuilderReader);

sc->start();

FileUtils::getInstance()->addSearchPath("res");

#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif

auto pEngine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
Expand Down
2 changes: 1 addition & 1 deletion samples/Javascript/TestJavascript/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ cp -rf "$APP_ROOT"/../Shared/tests/* "$APP_ANDROID_ROOT"/assets


# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets

echo "Using prebuilt externals"
echo
Expand Down
4 changes: 4 additions & 0 deletions samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ bool AppDelegate::applicationDidFinishLaunching()

sc->start();

#if defined(COCOS2D_DEBUG) && (COCOS2D_DEBUG > 0)
sc->enableDebugger();
#endif

auto pEngine = ScriptingCore::getInstance();
ScriptEngineManager::getInstance()->setScriptEngine(pEngine);
ScriptingCore::getInstance()->runScript("boot-jsb.js");
Expand Down
2 changes: 1 addition & 1 deletion samples/Javascript/WatermelonWithMe/proj.android/build_native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ mkdir "$APP_ANDROID_ROOT"/assets
cp -rf "$RESROUCE_ROOT"/* "$APP_ANDROID_ROOT"/assets

# copy bindings/*.js into assets' root
cp -f "$BINDINGS_JS_ROOT"/*.js "$APP_ANDROID_ROOT"/assets
cp -rf "$BINDINGS_JS_ROOT"/* "$APP_ANDROID_ROOT"/assets

echo "Using prebuilt externals"
echo
Expand Down
Loading