Skip to content

Commit dbaedc9

Browse files
doc: update docs to V8 on iOS changes
1 parent 30b32a9 commit dbaedc9

File tree

3 files changed

+19
-19
lines changed

3 files changed

+19
-19
lines changed

README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ The core library source code is in this repo. If you are looking for the *source
2020

2121
1. To provide the fixes necessary to run Node.js on mobile operating systems.
2222
1. To investigate which features need to be added to Node.js in order to make it a useful tool for mobile app development.
23-
1. To diverge as little as possible from nodejs/node and nodejs/node-chakracore, while fulfilling goals (1) and (2).
23+
1. To diverge as little as possible from nodejs/node, while fulfilling goals (1) and (2).
2424

2525
## Download
2626
Binaries for Android and iOS are available at https://github.com/janeasystems/nodejs-mobile/releases.
2727

2828
## Documentation
2929
Documentation can be found on the [project website](https://code.janeasystems.com/nodejs-mobile). Sample code is available in the [samples repo](https://github.com/janeasystems/nodejs-mobile-samples/).
3030

31-
***Disclaimer:*** documentation found in this repository is currently unchanged from the parent repository and may only be applicable to node-chakracore.
31+
***Disclaimer:*** documentation found in this repository is currently unchanged from the parent repository and may only be applicable to upstream node.
3232

3333
## Build Instructions
3434

@@ -44,13 +44,13 @@ sudo apt-get install -y build-essential git python
4444
sudo apt-get install -y curl unzip
4545
```
4646

47-
#### Install Android NDK r20b for Linux:
47+
#### Install Android NDK r21 for Linux:
4848
Choose a location where you want to install the Android NDK and run:
4949
```sh
50-
curl https://dl.google.com/android/repository/android-ndk-r20b-linux-x86_64.zip -o ndk.zip
50+
curl https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip -o ndk.zip
5151
unzip ndk.zip
5252
```
53-
It will create a `android-ndk-r20b` folder. Save that path for later.
53+
It will create a `android-ndk-r21` folder. Save that path for later.
5454

5555
### Prerequisites to build the Android library on macOS:
5656

@@ -62,13 +62,13 @@ As an alternative, installing one of these will install `git`:
6262
* [Homebrew](https://brew.sh/)
6363
* [Git-SCM](https://git-scm.com/download/mac)
6464

65-
#### Install Android NDK r20b for macOS:
65+
#### Install Android NDK r21 for macOS:
6666
Choose a location where you want to install the Android NDK and run:
6767
```sh
68-
curl https://dl.google.com/android/repository/android-ndk-r20b-darwin-x86_64.zip -o ndk.zip
68+
curl https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip -o ndk.zip
6969
unzip ndk.zip
7070
```
71-
It will create a `android-ndk-r20b` folder. Save that path for later.
71+
It will create a `android-ndk-r21` folder. Save that path for later.
7272

7373
### Building the Android library on Linux or macOS:
7474

@@ -82,11 +82,11 @@ git checkout mobile-master
8282

8383
#### 2a) Using the Android helper script:
8484

85-
The `tools/android_build.sh` script takes as first argument the Android NDK path (in our case is `~/android-ndk-r20b`). The second argument is optional and is the target architecture, which can be one of the following: `arm`, `x86`, `arm64` or `x86_64`. If no target architecture is provided, it will build all available architectures.
85+
The `tools/android_build.sh` script takes as first argument the Android NDK path (in our case is `~/android-ndk-r21`). The second argument is optional and is the target architecture, which can be one of the following: `arm`, `x86`, `arm64` or `x86_64`. If no target architecture is provided, it will build all available architectures.
8686
Run:
8787

8888
```sh
89-
./tools/android_build.sh ~/android-ndk-r20b
89+
./tools/android_build.sh ~/android-ndk-r21
9090
```
9191

9292
When done, each built shared library will be placed in `out_android/$(ARCHITECTURE)/libnode.so`.
@@ -95,7 +95,7 @@ When done, each built shared library will be placed in `out_android/$(ARCHITECTU
9595
Run the `android-configure` script to configure the build with the path to the downloaded NDK and the desired target architecture.
9696

9797
```sh
98-
source ./android-configure ../android-ndk-r20b arm
98+
source ./android-configure ../android-ndk-r21 arm
9999
```
100100

101101
Start the build phase:
@@ -157,7 +157,7 @@ git checkout mobile-master
157157
./tools/ios_framework_prepare.sh
158158
```
159159

160-
That will configure `gyp` to build Node.js and its dependencies as static libraries for iOS on the arm64 and x64 architectures, using the `ChakraCore` engine with JIT disabled. The script copies those libraries to `tools/ios-framework/bin/arm64` and `tools/ios-framework/bin/x64`, respectively. It also merges them into static libraries that contain strips for both architectures, which will be placed in `tools/ios-framework/bin` and used by the `tools/ios-framework/NodeMobile.xcodeproj` Xcode project.
160+
That will configure `gyp` to build Node.js and its dependencies as static libraries for iOS on the arm64 and x64 architectures, using the `v8` engine configured to start with JIT disabled. The script copies those libraries to `tools/ios-framework/bin/arm64` and `tools/ios-framework/bin/x64`, respectively. It also merges them into static libraries that contain strips for both architectures, which will be placed in `tools/ios-framework/bin` and used by the `tools/ios-framework/NodeMobile.xcodeproj` Xcode project.
161161

162162
The helper script builds the `tools/ios-framework/NodeMobile.xcodeproj` Xcode project into three frameworks:
163163
- The framework to run on iOS devices: `out_ios/Release-iphoneos/NodeMobile.framework`
@@ -167,7 +167,7 @@ The helper script builds the `tools/ios-framework/NodeMobile.xcodeproj` Xcode pr
167167
While the universal framework is useful for faster Application development, due to supporting both iOS devices and simulators, frameworks containing simulator strips will not be accepted on the App Store. Before trying to submit your application, it would be advisable to use the `Release-iphoneos/NodeMobile.framework` in your submission archive or strip the x64 slices from the universal framework's binaries before submitting.
168168

169169
## Running tests
170-
Please see the [TESTING.md](https://github.com/janeasystems/nodejs-mobile/blob/mobile-master/doc_mobile/TESTING.md) file in the `doc_mobile` folder in this source distribution.
170+
Please see the [TESTING.md](./doc_mobile/TESTING.md) file in the `doc_mobile` folder in this source distribution.
171171

172172
## Contributing
173-
Please see the [CONTRIBUTING](https://github.com/janeasystems/nodejs-mobile/blob/mobile-master/doc_mobile/CONTRIBUTING.md) file in the `doc_mobile` folder in this source distribution.
173+
Please see the [CONTRIBUTING](./doc_mobile/CONTRIBUTING.md) file in the `doc_mobile` folder in this source distribution.

doc_mobile/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Contributing to Node.js for Mobile Apps
22

33
## Code Contributions
4-
Only changes that fall within the scope of the [project goals](https://github.com/janeasystems/nodejs-mobile/blob/mobile-master/README.md#project-goals) will be accepted.
4+
Only changes that fall within the scope of the [project goals](../README.md#project-goals) will be accepted.
55

66
If you want to implement a major feature or a semantical change, please open an issue for discussion first. For minor fixes, feel free to just open a pull request.
77

doc_mobile/TESTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ iOS tests depend on the [`ios-deploy` tool](https://github.com/phonegap/ios-depl
1717
npm install -g [email protected]
1818
```
1919

20-
You'll need to build nodejs-mobile, so [its prerequisites should also be installed on your system.](https://github.com/janeasystems/nodejs-mobile#prerequisites-to-build-the-ios-framework-library-on-macos)
20+
You'll need to build nodejs-mobile, so [its prerequisites should also be installed on your system.](../README.md#prerequisites-to-build-the-ios-framework-library-on-macos)
2121

2222
### Build and install the iOS test app
2323

24-
Build nodejs-mobile [for iOS](https://github.com/janeasystems/nodejs-mobile#building-the-ios-framework-library-on-macos):
24+
Build nodejs-mobile [for iOS](../README.md#building-the-ios-framework-library-on-macos):
2525
```sh
2626
./tools/ios_framework_prepare.sh
2727
```
@@ -76,11 +76,11 @@ You'll need [Android Studio](https://developer.android.com/studio/install.html)
7676

7777
You should set the Environment variables required to build Android Applications from the command line: the `ANDROID_HOME` variable pointing to your `android-sdk` path and the `ANDROID_NDK_HOME` variable pointing to the installed NDK path (it usually is `$ANDROID_HOME/ndk-bundle`) . You should also add `$ANDROID_HOME/platform-tools`, `$ANDROID_HOME/tools` and `$ANDROID_HOME/tools/bin` to the `PATH` environment variable.
7878

79-
You'll need to build nodejs-mobile, so [its prerequisites should also be installed on your system.](https://github.com/janeasystems/nodejs-mobile#prerequisites-to-build-the-android-library-on-linux-ubuntudebian)
79+
You'll need to build nodejs-mobile, so [its prerequisites should also be installed on your system.](../README.md#prerequisites-to-build-the-android-library-on-linux-ubuntudebian)
8080

8181
### Build and install the Android test app
8282

83-
Build nodejs-mobile [for Android](https://github.com/janeasystems/nodejs-mobile#building-the-android-library-on-linux-or-macos):
83+
Build nodejs-mobile [for Android](../README.md#building-the-android-library-on-linux-or-macos):
8484
```sh
8585
./tools/android_build.sh "$ANDROID_NDK_HOME"
8686
```

0 commit comments

Comments
 (0)