Skip to content

Commit 14d67c6

Browse files
committed
fix scripts
1 parent 7204378 commit 14d67c6

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

scripts/info.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/re
55
INFO=$(svn info "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
66
CONFIG=$(node -e "console.log(require('./package.json').config)")
77

8-
SIZE=$(du -ah $ROOTDIR/build/compiled || true)
8+
SIZE=$(du -ah $ROOTDIR/build/compiled || echo "-")
99

10-
printf "\n\n\n\n\n\t\t\tCompiled Version: \x1B[32m$REVISION\x1B[0m\n\n\n"
11-
printf "Config:\t$CONFIG\n\n"
12-
printf "Info:\t$INFO\n\n"
10+
printf "\n\n\n\n\n\t\t\tRevision: \x1B[32m$REVISION\x1B[0m\n\n\n"
11+
printf "Config:\n$CONFIG\n\n"
12+
printf "Info:\n$INFO\n\n"
1313
printf "Size:\t$SIZE\n\n"

scripts/start.sh

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@
33
ROOTDIR=$PWD
44
TARGETDIR=$ROOTDIR/build/target
55
REVISION=$(svn info --show-item last-changed-revision "https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-${npm_package_config_webkitGTK}")
6-
printf $REVISION
76

87
prep() {
9-
printf "\t\t=============== copy downloaded sources ====================="
8+
printf "\n\n\t\t===================== copy downloaded sources =====================\n\n"
109
rm -rf $TARGETDIR
1110
cp -Rf $ROOTDIR/build/download $TARGETDIR
1211

13-
printf "\t\t=============== patch and make icu into target/icu/host ====================="
12+
printf "\n\n\t\t===================== patch and make icu into target/icu/host =====================\n\n"
1413
ICU_VERSION_MAJOR="$(awk '/ICU_VERSION_MAJOR_NUM/ {print $3}' $TARGETDIR/icu/source/common/unicode/uvernum.h)"
15-
printf "ICU version: ${ICU_VERSION_MAJOR}"
14+
printf "ICU version: ${ICU_VERSION_MAJOR}\n"
1615
patch -d $TARGETDIR -p1 < $ROOTDIR/patches/icu.patch
1716

1817
# use compiled .dat archive from Android Chromium
@@ -26,7 +25,7 @@ prep() {
2625
make -j5
2726
cd $ROOTDIR
2827

29-
printf "\t\t=============== patch jsc ====================="
28+
printf "\n\n\t\t===================== patch jsc =====================\n\n"
3029
patch -d $TARGETDIR -p1 < $ROOTDIR/patches/jsc.patch
3130

3231
# disable i18n for non-i18n build
@@ -38,17 +37,17 @@ prep() {
3837
#remove icu headers from WTF, so it won't use them instead of the ones from icu/host/common
3938
rm -rf "$TARGETDIR"/webkit/Source/WTF/icu
4039

41-
printf "orig: $(find $ROOTDIR/build/target | grep \.orig || true)"
40+
printf "orig: $(find $ROOTDIR/build/target | grep \.orig || true)\n"
4241
}
4342

4443
compile() {
45-
printf "\t\t=============== compile jsc ====================="
44+
printf "\n\n\t\t===================== compile jsc =====================\n\n"
4645
rm -rf $ROOTDIR/build/compiled
4746
$ROOTDIR/scripts/compile/all.sh
4847
}
4948

5049
createAAR() {
51-
printf "\t\t=============== create aar ====================="
50+
printf "\n\n\t\t===================== create aar =====================\n\n"
5251
cd $ROOTDIR/lib
5352
./gradlew clean createAAR --project-prop revision="$REVISION" --project-prop i18n="${I18N}"
5453
cd $ROOTDIR

0 commit comments

Comments
 (0)