Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/0.3.0.7' into 0.3.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
ktrzeciaknubisa committed Sep 29, 2015
2 parents bd7b240 + 7a6ccdd commit bde3288
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
12 changes: 6 additions & 6 deletions doc/HOW_TO_COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ git submodule update
> For leveldown-mobile API, see [https://github.com/Level/leveldown-mobile](https://github.com/Level/leveldown-mobile)

##### Notes
#### Notes
If your python binary is in a non-standard location or has a non-standard name,
run the following instead:

Expand All @@ -98,12 +98,12 @@ run the following instead:
make
make install

##### Download JXcore
#### Download JXcore
You can download (latest stable) binaries for various operating systems from
[http://jxcore.com/downloads/](http://jxcore.com/downloads/)
(Future `jxcore.io` releases will be shared from `http://jxcore.io`)

##### Notes for Windows
#### Notes for Windows

If you run `vcbuild.bat` without specifying the target architecture, it will be determined by a
current Python version you have installed (not the operating system architecture).
Expand All @@ -118,16 +118,16 @@ Then you can still build JXcore x32 on Windows x64:
/ $> vcbuild.bat ia32
```

##### Notes for CentOS/Red Hat
#### Notes for CentOS/Red Hat

If you'll ever have problem with GCC 4.7+ installation on Red Hat, please see
[#297](https://github.com/jxcore/jxcore/issues/297).

##### Compiling against Mipsel
#### Compiling against Mipsel

Your linux distro might be using an older version of GCC. We encourage you to set `--dest-os=mipsel`
explicitly within the `./configure` call

```
./configure ...... --dest-os=mipsel
./configure ...... --dest-cpu=mipsel
```
10 changes: 4 additions & 6 deletions doc/ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,14 @@ Node 0.12 (v8 + api) updates will be part of the upcoming releases (as soon as n

### Current Release Roadmap*
* [Mobile Test Cases](https://github.com/jxcore/jxcore/blob/master/doc/TODO%20-%20Testing.md) (@)
* Native Public API Documentation (@)
* Complete embedded native interface API (+)
* Improve embedded native interface API (+)
* JXcore build time native module embedding (@)
* JX package protection with public/private keys (@)
* Android, iOS cordova interface (+)
* Compiled JavaScript for Mobile Applications (+)
* JXcore packaging improvements [use binary only instead of base64]
* Windows UWP support (+)

### Next Release RoadMap*
* Debugger support for SpiderMonkey (@)
* Windows ARM (@)
* Node 4.x update (@)
* Power7, Power8, Mips64 Arch. support (+)
* Debugging from Mobile Applications (@)

10 changes: 7 additions & 3 deletions lib/console.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,15 @@ Console.prototype.error = function() {
}
};

Console.prototype.dir = function(object) {
Console.prototype.dir = function(object, options) {
var formattedTxt = util.inspect(object, util._extend({
customInspect: false
}, options)) + '\n';

if (!isAndroid) {
this._stdout.write(util.inspect(object) + '\n');
this._stdout.write(formattedTxt);
} else {
$tw.print(util.inspect(object) + '\n');
$tw.print(formattedTxt);
}
};

Expand Down

0 comments on commit bde3288

Please sign in to comment.