AndroWish: Check-in [7a33036b05]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

Comment:	merge with trunk
Timelines:	family \| ancestors \| descendants \| both \| wtf-8-experiment
Files:	files \| file ages \| folders
SHA1:	7a33036b054cc92c6bf3455e8090d76514fb2aa0
User & Date:	chw 2019-06-12 11:35:07

Context

2019-06-12
13:05		merge with trunk check-in: 6c7a410ba0 user: chw tags: wtf-8-experiment
11:35		merge with trunk check-in: 7a33036b05 user: chw tags: wtf-8-experiment
11:33		fix typos in some build scripts check-in: 9d6b7570a1 user: chw tags: trunk
05:01		merge with trunk check-in: d6daad45bf user: chw tags: wtf-8-experiment

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to undroid/build-vanilla-generic.sh.

    97     97       aarch*)
    98     98         SUBDIRS="${SUBDIRS} piio"
    99     99         ;;
   100    100     esac
   101    101     SUBDIRS="${SUBDIRS} libsocketcan tclcan fswatch tserialport tcl-fuse"
   102    102   fi
   103    103   
   104         -if pkg-config --exists webkit2gkt-4.0 ; then
          104  +if pkg-config --exists webkit2gtk-4.0 ; then
   105    105     SUBDIRS="${SUBDIRS} twv"
   106    106   fi
   107    107   
   108    108   SUBDIRS="${SUBDIRS} topcua parse_args tkvlc tclJBlend"
   109    109   
   110    110   ACTION="$1"
   111    111   if test -z "$ACTION" ; then

Changes to undroid/build-vanilla-linux32.sh.

    92     92   SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
    93     93   SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
    94     94   SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
    95     95   SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
    96     96   SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
    97     97   SUBDIRS="${SUBDIRS} tcl-fuse"
    98     98   
    99         -if pkg-config --exists webkit2gkt-4.0 ; then
           99  +if pkg-config --exists webkit2gtk-4.0 ; then
   100    100     SUBDIRS="${SUBDIRS} twv"
   101    101   fi
   102    102   
   103    103   ACTION="$1"
   104    104   if test -z "$ACTION" ; then
   105    105     ACTION=build
   106    106   fi

Changes to undroid/build-vanilla-linux64.sh.

    92     92   SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
    93     93   SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
    94     94   SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
    95     95   SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
    96     96   SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
    97     97   SUBDIRS="${SUBDIRS} tcl-fuse"
    98     98   
    99         -if pkg-config --exists webkit2gkt-4.0 ; then
           99  +if pkg-config --exists webkit2gtk-4.0 ; then
   100    100     SUBDIRS="${SUBDIRS} twv"
   101    101   fi
   102    102   
   103    103   ACTION="$1"
   104    104   if test -z "$ACTION" ; then
   105    105     ACTION=build
   106    106   fi