Skip to content

Commit

Permalink
Merge pull request #259 from iLib-js/development
Browse files Browse the repository at this point in the history
Merge to master to prepare for release
  • Loading branch information
ehoogerbeets authored Sep 14, 2020
2 parents 04f6387 + c7d98fc commit c07e927
Show file tree
Hide file tree
Showing 142 changed files with 37,697 additions and 4,824 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ node_js:
- "9"
- "10"
- "11"
- "12"
- "13"
- "14"
env:
- CXX=g++-4.8
before_install:
Expand Down
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version=14.6.0
version=14.6.1
5 changes: 5 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,11 @@ limitations under the License.
<iterate target="doc"/>
</target>

<target name="apidocs" description="Update the api docs for github pages">
<subant target="apidocs" buildpath="java"/>
<subant target="apidocs" buildpath="js"/>
</target>

<target name="deps" description="Install dependencies for travis-ci">
<!-- nothing yet -->
</target>
Expand Down
13 changes: 13 additions & 0 deletions docs/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
Release Notes for Version 14
============================

Build 010
-------
Published as version 14.6.1

New Features:

Bug Fixes:
* Updated to IANA time zone data 2020a
* Put base option back on ResBundle
* Fixed a few tools and dependencies so that ilib works on node v14
* Fixed a default timezone in `my-MM` to `Asia/Yangon`
* Fixed a bug which a default script for `ky` should be `Cyrl` instead of `Arabic`

Build 009
-------
Published as version 14.6.0
Expand Down
6 changes: 5 additions & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

Hello, and welcome to the iLib project!

View this documentation on [github pages](https://ilib-js.github.io/iLib/docs/)

* [Welcome](Welcome.md)
* [History](History.md)
* [License](License.md)
Expand All @@ -10,7 +12,7 @@ Hello, and welcome to the iLib project!
# Documentation #

* [Getting Started](GettingStarted.md)
* [Old Tutorial](tutorial/iLib1.0JSTutorial.pdf)
* Tutorials:
* [Handling Phone Numbers in iLib](tutorial/phone.md)
* [Name Parsing and Formatting](tutorial/name.md)
* [Glyphs, Characters, and Character Normalization](tutorial/characters.md)
Expand All @@ -20,6 +22,8 @@ Hello, and welcome to the iLib project!
* Architecture and Process
* [Overall Architecture](Architecture.md)
* [CommonJS Modularization Support](tutorial/modules.md) as of 11.0
* For ES6-style modules, see the [ilib-es6](https://github.com/ilib-js/ilib-es6/) project
which provides wrappers for all ilib classes
* [Updating the time zone information](tutorial/timezone.md)
* [Running unit test on QT/QML](QtTest.md)
* API Reference:
Expand Down
16 changes: 16 additions & 0 deletions java/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ limitations under the License.
<property name="build.javadoc" value="${build.output}/javadoc"/>
<property name="build.config" value="config"/>
<property name="log4j.config.file" value="${build.config}/log4j.properties"/>
<property name="build.docs" value="${build.base}/../docs"/>
<property name="build.apidocs" value="${build.docs}/api/javadoc"/>

<property name="jar.ilib" value="ilib-${version}-tools.jar"/>

Expand Down Expand Up @@ -106,6 +108,7 @@ limitations under the License.
<delete dir="${build.classes}"/>
<delete dir="${build.output}"/>
<delete dir="${build.data}"/>
<delete dir="${build.apidocs}"/>
</target>

<target name="prepare" description="Prepare all directories that are needed before the project can be built">
Expand Down Expand Up @@ -374,4 +377,17 @@ limitations under the License.
<link href="http://java.sun.com/j2se/1.4/docs/api/"/>
</javadoc>
</target>

<target name="apidocs"
depends="doc"
description="Updates the API docs">
<mkdir dir="${build.apidocs}"/>
<copy todir="${build.apidocs}">
<fileset dir="${build.javadoc}">
<include name="**/package-list"/>
<include name="**/*.html"/>
<include name="**/*.css"/>
</fileset>
</copy>
</target>
</project>
21 changes: 17 additions & 4 deletions js/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ limitations under the License.
<property name="build.base" value="${basedir}"/>
<property name="build.dist" value="${build.base}/../dist"/>
<property name="build.export" value="${build.base}/../export"/>
<property name="build.demo" value="${build.base}/../docs/demo"/>
<property name="build.docs" value="${build.base}/../docs"/>
<property name="build.demo" value="${build.docs}/demo"/>
<property name="build.apidocs" value="${build.docs}/api/jsdoc"/>
<property name="build.tools" value="${build.base}/../tools"/>
<property name="build.tools.qmlizer" value="${build.base}/../tools/qmlizer"/>
<property name="build.tools.build" value="${build.base}/../tools/build"/>
Expand All @@ -51,8 +53,8 @@ limitations under the License.
<property name="nm.bin" value="${build.base}/../node_modules/.bin"/>
<property name="jar.ilib" value="ilib.jar"/>
<property name="locales.default" value="en-AU,en-CA,en-GB,en-IN,en-NG,en-PH,en-PK,en-SG,en-US,en-ZA,de-DE,fr-CA,fr-FR,es-AR,es-ES,es-MX,id-ID,it-IT,ja-JP,ko-KR,pt-BR,ru-RU,tr-TR,vi-VN,zxx-XX,zh-Hans-CN,zh-Hant-HK,zh-Hant-TW,zh-Hans-SG"/>
<property name="locales.unittest" value="aa-DJ,af-NA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,asa-TZ,as-IN,az-Latn-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-BS,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cic-US,cop-EG,cs-CZ,da-DK,de-AT,de-CH,de-DE,el-GR,en-AM,en-AU,en-CA,en-ET,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-IS,en-KE,en-LK,en-LR,en-MP,en-MW,en-MY,en-NG,en-NZ,en-PA,en-PH,en-PK,en-PR,en-RW,en-SD,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-BO,es-CL,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-NI,es-PA,es-PE,es-PH,es-PR,es-PY,es-SV,es-US,es-UY,es-VE,et-EE,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fo-FO,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AZ,hy-AM,id-ID,id-MY,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-Arab-IQ,ku-Arab-IR,ku-IR,lg-UG,ln-CF,lt-LT,lv-LV,fr-Latn-MA,mi-CK,mk-MK,ml-IN,mm-MM,mn-CN,mn-Cyrl-MN,mr-IN,ms-BN,ms-MY,mus-US,ne-NP,nl-BE,nl-NL,nb-NO,nn-NO,no-NO,no-SJ,om-ET,or-IN,os-RU,pa-Arab,pa-IN,pa-Arab-PK,pl-PL,ps-AF,pt-AO,pt-BR,pt-CV,pt-GW,pt-GQ,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-GE,ru-KG,ru-KZ,ru-RU,ru-TM,shi-Tfng-MA,si-LK,sk-SK,sl-SI,sl-SL,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-RS,sr-Latn-ME,sr-RS,sr-Latn-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-KE,sw-UG,ta-IN,ta-LK,ta-MY,ta-SG,te-IN,th-TH,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,uz-UZ,vai-Latn-LR,vi-VN,zh-Hans-CN,zh-Hant-HK,zh-Hans-HK,zh-Hans-MY,zh-Hant-TW,zh-Hans-MO,zh-Hant-MO,zh-Hans-SG,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX,zxx-XA,zxx-XB"/>
<property name="locales.demo" value="aa-DJ,af-NA,af-ZA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,as-IN,asa-TZ,az-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cop-EG,cs-CZ,da-DK,de-AT,de-CH,de-DE,el-GR,en-AU,en-CA,en-ET,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-KE,en-LK,en-LR,en-MW,en-MY,en-NG,en-NZ,en-PH,en-PK,en-PR,en-RW,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-PH,es-SV,es-UY,es-VE,et-EE,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AM,hy-AZ,id-ID,id-MY,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-IR,lg-UG,ln-CF,lt-LT,lv-LV,mi-CK,mk-MK,ml-IN,mn-CN,mr-IN,ms-BN,ms-MY,nb-NO,ne-IN,nl-BE,nl-CW,nl-GF,nl-NL,nl-SR,no-BV,no-NO,no-SJ,om-ET,or-IN,os-RU,pa-Arab-PK,pl-PL,pt-AO,pt-BR,pt-CV,pt-GW,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-KG,ru-KZ,ru-RU,ru-TM,si-LK,sk-SK,sl-SI,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-ME,sr-Latn-RS,sr-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-UG,ta-LK,ta-MY,ta-SG,te-IN,th-TH,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,vai-Latn-LR,vi-VN,zh-Hans-CN,zh-Hans-MO,zh-Hans-MY,zh-Hans-SG,zh-Hant-HK,zh-Hant-TW,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX"/>
<property name="locales.unittest" value="aa-DJ,af-NA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,asa-TZ,as-IN,az-Latn-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-BS,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cic-US,cop-EG,cs-CZ,da-DK,de-AT,de-CH,de-DE,el-GR,en-AM,en-AU,en-CA,en-ET,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-IS,en-KE,en-LK,en-LR,en-MP,en-MW,en-MY,en-NG,en-NZ,en-PA,en-PH,en-PK,en-PR,en-RW,en-SD,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-BO,es-CL,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-NI,es-PA,es-PE,es-PH,es-PR,es-PY,es-SV,es-US,es-UY,es-VE,et-EE,eu-ES,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fo-FO,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AZ,hy-AM,id-ID,id-MY,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-Arab-IQ,ku-Arab-IR,ku-IR,ky-KG,lg-UG,ln-CF,lo-LA,lt-LT,lv-LV,fr-Latn-MA,mi-CK,mk-MK,ml-IN,mm-MM,mn-CN,mn-Cyrl-MN,mr-IN,ms-BN,ms-MY,mus-US,my-MM,ne-NP,nl-BE,nl-NL,nb-NO,nn-NO,no-NO,no-SJ,om-ET,or-IN,os-RU,pa-Arab,pa-IN,pa-Arab-PK,pl-PL,ps-AF,pt-AO,pt-BR,pt-CV,pt-GW,pt-GQ,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-GE,ru-KG,ru-KZ,ru-RU,ru-TM,shi-Tfng-MA,si-LK,sk-SK,sl-SI,sl-SL,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-RS,sr-Latn-ME,sr-RS,sr-Latn-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-KE,sw-UG,ta-IN,ta-LK,ta-MY,ta-SG,te-IN,th-TH,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,uz-UZ,vai-Latn-LR,vi-VN,zh-Hans-CN,zh-Hant-HK,zh-Hans-HK,zh-Hans-MY,zh-Hant-TW,zh-Hans-MO,zh-Hant-MO,zh-Hans-SG,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX,zxx-XA,zxx-XB"/>
<property name="locales.demo" value="aa-DJ,af-NA,af-ZA,agq-CM,ak-GH,am-ET,ar-AE,ar-BH,ar-DJ,ar-DZ,ar-EG,ar-IQ,ar-JO,ar-KW,ar-LB,ar-LY,ar-MA,ar-MR,ar-OM,ar-QA,ar-SA,ar-SD,ar-SY,ar-TN,ar-YE,as-IN,asa-TZ,az-AZ,bas-CM,be-BY,bem-ZM,bg-BG,bh-IN,bm-ML,bn-IN,br-FR,bs-Cyrl-BA,bs-Latn-BA,bs-ME,ca-FR,cop-EG,cs-CZ,da-DK,de-AT,de-CH,de-DE,el-GR,en-AU,en-CA,en-ET,en-GB,en-GH,en-GM,en-HK,en-IE,en-IN,en-KE,en-LK,en-LR,en-MW,en-MY,en-NG,en-NZ,en-PH,en-PK,en-PR,en-RW,en-SG,en-SL,en-TZ,en-UG,en-US,en-ZA,en-ZM,es-AR,es-CO,es-CR,es-DO,es-EC,es-ES,es-GQ,es-GT,es-HN,es-MX,es-PH,es-SV,es-UY,es-VE,et-EE,eu-ES,fa-AF,fa-IR,ff-SN,fi-FI,fj-FJ,fr-AD,fr-BE,fr-BF,fr-BJ,fr-CA,fr-CD,fr-CF,fr-CG,fr-CH,fr-CI,fr-CM,fr-DJ,fr-DZ,fr-FR,fr-GA,fr-GN,fr-LB,fr-LU,fr-MG,fr-ML,fr-RW,fr-SN,fr-TG,fr-YT,ga-IE,gl-ES,gu-IN,ha-Latn-NG,he-IL,hi-IN,hr-HR,hr-ME,hu-HU,hy-AM,hy-AZ,id-ID,id-MY,it-CH,it-IT,is-IS,it-SM,ja-JP,ka-GE,ka-IR,kk-Cyrl-KZ,km-KH,kn-IN,ko-KR,ks-Arab-IN,ku-IR,ky-KG,lg-UG,ln-CF,lo-LA,lt-LT,lv-LV,mi-CK,mk-MK,ml-IN,mn-CN,mr-IN,ms-BN,ms-MY,my-MM,nb-NO,ne-IN,ne-NP,nl-BE,nl-CW,nl-GF,nl-NL,nl-SR,no-BV,no-NO,no-SJ,om-ET,or-IN,os-RU,pa-Arab-PK,pl-PL,pt-AO,pt-BR,pt-CV,pt-GW,pt-MO,pt-MZ,pt-PT,pt-ST,pt-TL,ro-RO,ro-RS,ru-KG,ru-KZ,ru-RU,ru-TM,si-LK,sk-SK,sl-SI,so-ET,so-SO,sq-AL,sq-ME,sq-MK,sr-Cyrl-BA,sr-Latn-BA,sr-Latn-ME,sr-Latn-RS,sr-RS,ss-SZ,ss-ZA,st-LS,sv-FI,sv-SE,sw-UG,ta-LK,ta-MY,ta-SG,te-IN,th-TH,tr-TR,tr-CY,uk-UA,ur-IN,ur-PK,uz-AF,uz-Arab-AF,uz-Cyrl-UZ,uz-Latn-UZ,vai-Latn-LR,vi-VN,zh-Hans-CN,zh-Hans-MO,zh-Hans-MY,zh-Hans-SG,zh-Hant-HK,zh-Hant-TW,zh-Hant-US,zu-ZA,zxx-Cyrl-XX,zxx-Hans-XX,zxx-Hebr-XX,zxx-XX"/>
<property name="keep.these.comments" value="/(\!data|\!loadLocaleData|\!defineLocaleData|\!macro|eslint-)/"/>

<!-- =================================================================== -->
Expand Down Expand Up @@ -112,6 +114,7 @@ limitations under the License.
<delete file="${build.test}/nodeunit/nodeunit-qml.jsc"/>
<delete file="${build.lib}/ilib-qt.jsc"/>
<delete dir="${build.locale}"/>
<delete dir="${build.apidocs}"/>
</target>
<target name="prepare" depends="update.package.json" description="Prepare all directories that are needed before the project can be built">
<mkdir dir="${build.output.js}"/>
Expand Down Expand Up @@ -850,7 +853,7 @@ limitations under the License.
</target>
<target name="doc"
depends="testjsdoc"
description="creates jsdoc for all local java files in this project"
description="creates jsdoc for all local js files in this project"
unless="core.jsdoc.not.needed">
<delete dir="${build.jsdoc}"/>
<mkdir dir="${build.jsdoc}"/>
Expand All @@ -868,6 +871,16 @@ limitations under the License.
</exec>
</sequential>
</target>
<target name="apidocs"
depends="doc"
description="Updates the API docs">
<mkdir dir="${build.apidocs}"/>
<copy todir="${build.apidocs}">
<fileset dir="${build.jsdoc}">
<include name="**/*.html"/>
</fileset>
</copy>
</target>
<target name="testinfo" description="test whether or not the localeinfo.json files need to rebuilt">
<uptodate property="info.not.needed" targetFile="${build.locale.src}/localeinfo.stamp">
<srcfiles dir="${build.locale.src}" includes="**/*.jf"/>
Expand Down
Loading

0 comments on commit c07e927

Please sign in to comment.