update scripts, fixes #53

Author: DanielZlotin

README.md

@@ -24,9 +24,8 @@ This project is based on [facebook/android-jsc](https://github.com/facebook/andr
 
 1. Clone this repo
 1. Update the config section under `package.json` to the desired build configuration
-2. `npm run download`: downloads all needed sources
-3. `npm run prep`: copies downloaded sources and prepares for compilation
-4. `npm run start`: builds jsc (this might take some time...)
+1. `npm run download`: downloads all needed sources
+1. `npm run start`: builds jsc (this might take some time...)
 
 The zipfile containing the android-jsc AAR will be available at `/dist`.
 The library is packaged as a local Maven repository containing AAR files that include the binaries.

measure/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "android": "cd android && ./gradlew clean uninstallRelease installRelease",
+    "android": "cd android && ./gradlew clean uninstallAll installRelease",
     "androidi18n": "npm run android -- --project-prop i18n=true",
     "start": "node ./scripts/measure",
     "starti18n": "npm run start -- i18n",

package.json

@@ -23,12 +23,10 @@
     "clean": "rm -rf dist; rm -rf build",
     "info": "./scripts/info.sh",
     "download": "./scripts/download.sh",
-    "prep": "./scripts/prep.sh",
     "start": "./scripts/start.sh"
   },
   "config": {
     "webkitGTK": "2.18.2",
-    "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96",
-    "i18n": false
+    "chromiumICUCommit": "b34251f8b762f8e2112a89c587855ca4297fed96"
   }
 }

scripts/compile/all.sh

@@ -4,11 +4,11 @@ SCRIPT_DIR=$(cd `dirname $0`; pwd)
 export ANDROID_API=21
 
 compile_arch() {
-  printf "\n\n\n=================== compiling toolchain for $JSC_ARCH ===================\n\n\n"
+  printf "\n\n\n\t\t=================== compiling toolchain for $JSC_ARCH $FLAVOR ===================\n\n\n"
   $SCRIPT_DIR/toolchain.sh
-  printf "\n\n\n=================== compiling icu for $JSC_ARCH ===================\n\n\n"
+  printf "\n\n\n\t\t=================== compiling icu for $JSC_ARCH $FLAVOR ===================\n\n\n"
   $SCRIPT_DIR/icu.sh
-  printf "\n\n\n=================== compiling jsc for $JSC_ARCH ===================n\n\n"
+  printf "\n\n\n\t\t=================== compiling jsc for $JSC_ARCH $FLAVOR ===================n\n\n"
   $SCRIPT_DIR/jsc.sh
 }
 
@@ -28,7 +28,7 @@ compile() {
   done
 }
 
-if ${npm_package_config_i18n}
+if ${I18N}
 then
   export FLAVOR=intl
   export ENABLE_INTL=1

scripts/prep.sh

@@ -1,16 +1,68 @@
 #!/bin/bash -e
 
 ROOTDIR=$PWD
+TARGETDIR=$ROOTDIR/build/target
 REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
+printf $REVISION
 
-# compile
-rm -rf $ROOTDIR/build/compiled
-$ROOTDIR/scripts/compile/all.sh
+prep() {
+  printf "\t\t=============== copy downloaded sources ====================="
+  rm -rf $TARGETDIR
+  cp -Rf $ROOTDIR/build/download $TARGETDIR
 
-# create aar
-cd $ROOTDIR/lib
-./gradlew clean createAAR --project-prop revision="$REVISION" --project-prop i18n="$npm_package_config_i18n"
-cd $ROOTDIR
+  printf "\t\t=============== patch and make icu into target/icu/host ====================="
+  ICU_VERSION_MAJOR="$(awk '/ICU_VERSION_MAJOR_NUM/ {print $3}' $TARGETDIR/icu/source/common/unicode/uvernum.h)"
+  printf "ICU version: ${ICU_VERSION_MAJOR}"
+  patch -d $TARGETDIR -p1 < $ROOTDIR/patches/icu.patch
+
+  # use compiled .dat archive from Android Chromium
+  cp $TARGETDIR/icu/android/icudtl.dat $TARGETDIR/icu/source/data/in/icudt${ICU_VERSION_MAJOR}l.dat
+  rm $TARGETDIR/icu/source/data/translit/root_subset.txt $TARGETDIR/icu/source/data/translit/trnslocal.mk
+
+  rm -rf $TARGETDIR/icu/host
+  mkdir -p $TARGETDIR/icu/host
+  cd $TARGETDIR/icu/host
+  $TARGETDIR/icu/source/runConfigureICU Linux --prefix=$PWD/prebuilts CFLAGS="-Os" CXXFLAGS="--std=c++11" --disable-tests --disable-samples
+  make -j5
+  cd $ROOTDIR
+
+  printf "\t\t=============== patch jsc ====================="
+  patch -d $TARGETDIR -p1 < $ROOTDIR/patches/jsc.patch
+
+  # disable i18n for non-i18n build
+  if ${I18N}
+  then
+    patch -d $TARGETDIR -N -p1 < $ROOTDIR/patches/intl/icu-disabled.patch
+  fi
+
+  #remove icu headers from WTF, so it won't use them instead of the ones from icu/host/common
+  rm -rf "$TARGETDIR"/webkit/Source/WTF/icu
+
+  printf "orig: $(find $ROOTDIR/build/target | grep \.orig || true)"
+}
+
+compile() {
+  printf "\t\t=============== compile jsc ====================="
+  rm -rf $ROOTDIR/build/compiled
+  $ROOTDIR/scripts/compile/all.sh
+}
+
+createAAR() {
+  printf "\t\t=============== create aar ====================="
+  cd $ROOTDIR/lib
+  ./gradlew clean createAAR --project-prop revision="$REVISION" --project-prop i18n="${I18N}"
+  cd $ROOTDIR
+}
+
+export I18N=false
+prep
+compile
+createAAR
+
+export I18N=true
+prep
+compile
+createAAR
 
 npm run info
 echo "I am not slacking off, my code is compiling."