Skip to content

Commit

Permalink
Include local build article in build article
Browse files Browse the repository at this point in the history
Some information was duplicated in both articles, e.g.:
  * config.xml configuration
  * .tabrisignore
  * adding Cordova plugins
Move this information to the Project Layout section of the build article
and merge both sources.

Remove wrong information about .tabrisignore not being relevant in local
builds. Tabris CLI takes .tabrisignore into account.

Remove Configuration section, since all relevant information is now part
of Project Layout. If needed, Project Layout > config.xml can be
extracted to a separate article in a following change.

Change-Id: I30e79c692c38a8fde49355d09bc1eee6b7a8ac05
  • Loading branch information
cpetrov authored and ralfstx committed Jun 9, 2017
1 parent de7ec64 commit 62f2482
Show file tree
Hide file tree
Showing 7 changed files with 105 additions and 123 deletions.
152 changes: 100 additions & 52 deletions doc/build.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/cordova.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ While using the [Tabris.js Developer App](getting-started.md), your application

These plug-ins have been tested with Tabris.js and a [demo](https://github.com/eclipsesource/tabris-js/tree/master/examples/cordova) can be found among the Tabris.js examples.

Please note, default plug-ins are only included in the debug version of an app. If you want to use them in the release version, you should add them via `<plugin>` tags in the Cordova `config.xml` file: [Adding Plug-Ins](build.md#adding-plugins).
Please note, default plug-ins are only included in the debug version of an app. If you want to use them in the release version, you should add them via `<plugin>` tags in the Cordova `config.xml` file: [Integrating Cordova Plugins](build.md#integrating-cordova-plugins).

## Other Cordova plug-ins
To use Cordova plug-ins not part of the Tabris.js Developer App you need to add them during the [build](build.md) process. You can either create a release-ready version of your own app, or a enhanced version of the Developer App that contains the additional plug-ins (set *debug* mode to `ON`).
Expand Down
4 changes: 2 additions & 2 deletions doc/custom-widgets-android.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A Tabris.js widget consists of a [JavaScript API](custom-widgets.md) and a native client side implementation. This document describes how to create the native implementation for a custom widget on the Android platform.

In order to implement a custom widget you will need to build locally. Follow the [Local Build guide](local-build.md).
In order to implement a custom widget you will need to [build locally](build.md).

### Building upon Cordova infrastructure

Expand Down Expand Up @@ -143,7 +143,7 @@ private class OnDateChangeListener implements CalendarView.OnDateChangeListener

## Destroying a widget

When a widget is no longer being used we also need to take care of destroying it. In case of our custom Android `View` we receive a destroy operation in the `Operator` and are responsible for cleaning up any resources that are not required anymore. When an `Operator` inherits from the `AbstractViewOperator` the destroy operation will remove the view from the view hierarchy.
When a widget is no longer being used we also need to take care of destroying it. In case of our custom Android `View` we receive a destroy operation in the `Operator` and are responsible for cleaning up any resources that are not required anymore. When an `Operator` inherits from the `AbstractViewOperator` the destroy operation will remove the view from the view hierarchy.

```java
@Override
Expand Down
2 changes: 1 addition & 1 deletion doc/custom-widgets-ios.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A Tabris.js widget consists of a [JavaScript API](custom-widgets.md) and a native client side implementation. This document describes how to create the native implementation for a custom widget on the iOS platform.

In order to implement a custom widget you will need to build locally. Follow the [Local Build guide](local-build.md).
In order to implement a custom widget you will need to [build locally](build.md).

### Building upon Cordova infrastructure

Expand Down
2 changes: 1 addition & 1 deletion doc/developer-app.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The Tabris.js Developer App

The Tabris.js Developer App is the easiest way to start developing mobile apps without using a [build service](build.md) or [local build](local-build.md). It is available for free on the App Store and Play Store respectively. Simply follow the links below or search for "Tabris.js" in the store on your mobile device.
The Tabris.js Developer App is the easiest way to start developing mobile apps without having to perform an app build. It is available for free on the App Store and Play Store respectively. Simply follow the links below or search for "Tabris.js" in the store on your mobile device.

[![Tabris.js on Google play](https://tabrisjs.com/assets/img/playstore-badge.png)](https://play.google.com/store/apps/details?id=com.eclipsesource.tabrisjs2) [![Tabris.js on Apple App Store](https://tabrisjs.com/assets/img/appstore-badge.png)](https://itunes.apple.com/us/app/tabris.js-2/id1166468326?mt=8)

Expand Down
64 changes: 0 additions & 64 deletions doc/local-build.md

This file was deleted.

2 changes: 0 additions & 2 deletions doc/toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
url: windows-support.html
- title: Build your app
url: build.html
- title: Local Build
url: local-build.html
- title: Patch your app
url: patch.html

Expand Down

0 comments on commit 62f2482

Please sign in to comment.