Check-in [4ef9501cfc]
Not logged in
Home Downloads Timeline Branches Tags Tickets Wiki Login

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

Overview
Comment:add twv to vanillawish build scripts plus some cleanup in undroidwish build scripts
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 4ef9501cfc956bf5ad99fd44e8305b2474f75288
User & Date: chw 2019-06-11 09:12:18
Context
2019-06-11
09:16
update twv readme check-in: 446f86bc48 user: chw tags: trunk
09:12
add twv to vanillawish build scripts plus some cleanup in undroidwish build scripts check-in: 4ef9501cfc user: chw tags: trunk
09:10
add tcl upstream changes check-in: 52ad30fdda user: chw tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

jni/tcl/library/msgs/ja.msg became executable.

Changes to undroid/build-undroidwish-kmsdrm.sh. 

1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    case $(arch) in
      i*86)








|






|








1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    case $(arch) in
      i*86)

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

1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \








|






|








1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \

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

1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \








|






|








1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \

Changes to undroid/build-undroidwish-macosx.sh. 

1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    make -C ${HERE}/sdl2tk/sdl -f Makefile sdl2wish \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"








|





|








1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    make -C ${HERE}/sdl2tk/sdl -f Makefile sdl2wish \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"

Changes to undroid/build-undroidwish-wayland.sh. 

1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    case $(arch) in
      i*86)








|






|








1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844

    mkdir -p assets/bin
    cp -p ${PFX_HERE}/bin/sdl2wish8.6 assets/bin/undroidwish
  else
    # add contents of tclJBlend.jar for JVM
    ( cd assets ; unzip -q tclJBlend*/tclJBlend.jar )
  fi
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary undroidwish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk/sdl/sdl2wish ${HERE}/sdl2tk/sdl/sdl2wish.orig
    ln -s assets.zip zembed
    case $(arch) in
      i*86)

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

96
97
98
99
100
101
102




103
104
105
106
107
108
109
....
1554
1555
1556
1557
1558
1559
1560

















1561
1562
1563
1564
1565
1566
1567
....
1714
1715
1716
1717
1718
1719
1720



1721
1722
1723
1724
1725
1726
1727

      ;;
    aarch*)
      SUBDIRS="${SUBDIRS} piio"
      ;;
  esac
  SUBDIRS="${SUBDIRS} libsocketcan tclcan fswatch tserialport tcl-fuse"
fi





SUBDIRS="${SUBDIRS} topcua parse_args tkvlc tclJBlend"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi
................................................................................
      Makefile
    make || exit 1
    make install-binaries install-libraries DESTDIR=${HERE} || exit 1
    touch build-stamp
    echo >&3 "done"
  ) || fail
fi


















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  if test -d ${PFX_HERE}/lib/fuse* ; then
    cp -rp ${PFX_HERE}/lib/fuse* assets



  fi
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$(uname -o)" = "GNU/Linux" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi 
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.








>
>
>
>







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>
>
>








96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
....
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
....
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751

      ;;
    aarch*)
      SUBDIRS="${SUBDIRS} piio"
      ;;
  esac
  SUBDIRS="${SUBDIRS} libsocketcan tclcan fswatch tserialport tcl-fuse"
fi

if pkg-config --exists webkit2gkt-4.0 ; then
  SUBDIRS="${SUBDIRS} twv"
fi

SUBDIRS="${SUBDIRS} topcua parse_args tkvlc tclJBlend"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi
................................................................................
      Makefile
    make || exit 1
    make install-binaries install-libraries DESTDIR=${HERE} || exit 1
    touch build-stamp
    echo >&3 "done"
  ) || fail
fi

if test -d twv ; then
  echo -n "build twv ... "
  (
    exec 3>&1
    exec >> build.log 2>&1
    cd twv
    test -e build-stamp && echo >&3 "already done" && exit 0
    make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
      TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub8.6" || exit 1
    install -d ${PFX_HERE}/lib/twv0.1
    install -m 755 libtwv.so ${PFX_HERE}/lib/twv0.1
    install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
    touch build-stamp
    echo >&3 "done"
  ) || fail
fi

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  if test -d ${PFX_HERE}/lib/fuse* ; then
    cp -rp ${PFX_HERE}/lib/fuse* assets
  fi
  if test -d ${PFX_HERE}/lib/twv* ; then
    cp -rp ${PFX_HERE}/lib/twv* assets
  fi
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$(uname -o)" = "GNU/Linux" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi 
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.

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

91
92
93
94
95
96
97




98
99
100
101
102
103
104
....
1539
1540
1541
1542
1543
1544
1545

1546
1547
1548
1549
1550
1551
1552

















1553
1554
1555
1556
1557
1558
1559
....
1694
1695
1696
1697
1698
1699
1700



1701
1702
1703
1704
1705
1706
1707
....
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
....
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849

SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
SUBDIRS="${SUBDIRS} tcl-fuse"





ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  exec 3>&1
  exec >> build.log 2>&1
  cd tcl-fuse
  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  echo > exports '{ global: Fuse_*Init; local: *; };'

  perl -pi -e 's@\$\{LDFLAGS_DEFAULT\}@'-Wl,--version-script=$(pwd)/exports'@g' \
    Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail


















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/fuse* assets



  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$ACTION" != "ebuild" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.so
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  rm -f tassets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/unix/tclsh ${HERE}/tcl/unix/tclsh.orig
    ln -s tassets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \
................................................................................
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/unix/wish ${HERE}/sdl2tk.static/unix/wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \








>
>
>
>







 







>
|






>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>
>
>







 







|






|







 







|








91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
....
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
....
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
....
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
....
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874

SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
SUBDIRS="${SUBDIRS} tcl-fuse"

if pkg-config --exists webkit2gkt-4.0 ; then
  SUBDIRS="${SUBDIRS} twv"
fi

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  exec 3>&1
  exec >> build.log 2>&1
  cd tcl-fuse
  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  echo > exports '{ global: Fuse_*Init; local: *; };'
  perl \
    -pi -e 's@\$\{LDFLAGS_DEFAULT\}@'-Wl,--version-script=$(pwd)/exports'@g' \
    Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

if test -d twv ; then
  echo -n "build twv ... "
  (
    exec 3>&1
    exec >> build.log 2>&1
    cd twv
    test -e build-stamp && echo >&3 "already done" && exit 0
    make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
      TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub8.6" || exit 1
    install -d ${PFX_HERE}/lib/twv0.1
    install -m 755 libtwv.so ${PFX_HERE}/lib/twv0.1
    install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
    touch build-stamp
    echo >&3 "done"
  ) || fail
fi

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/fuse* assets
  if test -d ${PFX_HERE}/lib/twv* ; then
    cp -rp ${PFX_HERE}/lib/twv* assets
  fi
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$ACTION" != "ebuild" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.so
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  rm -f tassets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/unix/tclsh ${HERE}/tcl/unix/tclsh.orig
    ln -s tassets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \
................................................................................
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/unix/wish ${HERE}/sdl2tk.static/unix/wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \

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

91
92
93
94
95
96
97




98
99
100
101
102
103
104
....
1539
1540
1541
1542
1543
1544
1545

1546
1547
1548
1549
1550
1551
1552

















1553
1554
1555
1556
1557
1558
1559
....
1694
1695
1696
1697
1698
1699
1700



1701
1702
1703
1704
1705
1706
1707
....
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
....
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849

SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
SUBDIRS="${SUBDIRS} tcl-fuse"





ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  exec 3>&1
  exec >> build.log 2>&1
  cd tcl-fuse
  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  echo > exports '{ global: Fuse_*Init; local: *; };'

  perl -pi -e 's@\$\{LDFLAGS_DEFAULT\}@'-Wl,--version-script=$(pwd)/exports'@g' \
    Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail


















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/fuse* assets



  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$ACTION" != "ebuild" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.so
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  rm -f tassets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/unix/tclsh ${HERE}/tcl/unix/tclsh.orig
    ln -s tassets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \
................................................................................
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/unix/wish ${HERE}/sdl2tk.static/unix/wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \








>
>
>
>







 







>
|






>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>
>
>







 







|






|







 







|








91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
....
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
....
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
....
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
....
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874

SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf libsocketcan tclcan vu"
SUBDIRS="${SUBDIRS} rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus fswatch"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"
SUBDIRS="${SUBDIRS} tcl-fuse"

if pkg-config --exists webkit2gkt-4.0 ; then
  SUBDIRS="${SUBDIRS} twv"
fi

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  exec 3>&1
  exec >> build.log 2>&1
  cd tcl-fuse
  test -e build-stamp && echo >&3 "already done" && exit 0
  DESTDIR=${HERE} ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  echo > exports '{ global: Fuse_*Init; local: *; };'
  perl \
    -pi -e 's@\$\{LDFLAGS_DEFAULT\}@'-Wl,--version-script=$(pwd)/exports'@g' \
    Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

if test -d twv ; then
  echo -n "build twv ... "
  (
    exec 3>&1
    exec >> build.log 2>&1
    cd twv
    test -e build-stamp && echo >&3 "already done" && exit 0
    make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
      TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub8.6" || exit 1
    install -d ${PFX_HERE}/lib/twv0.1
    install -m 755 libtwv.so ${PFX_HERE}/lib/twv0.1
    install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
    touch build-stamp
    echo >&3 "done"
  ) || fail
fi

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.so \
................................................................................
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/fuse* assets
  if test -d ${PFX_HERE}/lib/twv* ; then
    cp -rp ${PFX_HERE}/lib/twv* assets
  fi
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  if test "$ACTION" != "ebuild" ; then
    cp -rp ${AWDIR}/undroid/mkappimg assets
  fi
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.so
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  rm -f tassets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/unix/tclsh ${HERE}/tcl/unix/tclsh.orig
    ln -s tassets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \
................................................................................
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  rm -f assets/*/*.a
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/unix/wish ${HERE}/sdl2tk.static/unix/wish.orig
    ln -s assets.zip zembed
    objcopy --rename-section .data=.const.zip \
      --set-section-flags .data=readonly,load,data,alloc,contents \

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

90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
....
1304
1305
1306
1307
1308
1309
1310















1311
1312
1313
1314
1315
1316
1317
....
1433
1434
1435
1436
1437
1438
1439

1440
1441
1442
1443
1444
1445
1446
....
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
....
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575

SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk jpeg-turbo"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk tkhtml"
SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tserialport topcua parse_args tkvlc"
SUBDIRS="${SUBDIRS} tclJBlend"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
    ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/macosx \
      --enable-threads || exit 1
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail
















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.dylib \
................................................................................
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets

  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.dylib
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >myzip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/macosx/tclsh ${HERE}/tcl/macosx/tclsh.orig
    ln -s tassets.zip zembed
    make -C ${HERE}/tcl/macosx -f Makefile tclsh \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl since we have static wish
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  ${PFX_HERE}/bin/tclsh8.6 myzip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/macosx/wish ${HERE}/sdl2tk.static/macosx/wish.orig
    ln -s assets.zip zembed
    make -C ${HERE}/sdl2tk.static/macosx -f Makefile wish \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"








|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>







 







|





|







 







|








90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
....
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
....
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
....
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
....
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591

SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk jpeg-turbo"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk tkhtml"
SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tserialport topcua parse_args tkvlc"
SUBDIRS="${SUBDIRS} tclJBlend twv"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
    ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/macosx \
      --enable-threads || exit 1
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build twv ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd twv
  test -e build-stamp && echo >&3 "already done" && exit 0
  make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
    TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub8.6" || exit 1
  install -d ${PFX_HERE}/lib/twv0.1
  install -m 755 libtwv.dylib ${PFX_HERE}/lib/twv0.1
  install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/tclsh* ${PFX_HERE}/bin/wish* ${PFX_HERE}/lib/*.dylib \
................................................................................
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/twv* assets
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl for libtk*.dylib
  cat > tassets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 [list load [file join $dir \
    libtk8.6[info sharedlibextension]] Tk]
EOD
  # tcl minizip script using zipfs with cmd line like zipfs::mkzip
  cat >minizip.tcl <<'EOD'
  package require zipfs
  zipfs::mkzip {*}$argv
EOD
  # build ZIP to be embedded for vanillatclsh
  rm -f tassets.zip
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl tassets.zip tassets tassets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillatclsh by embedding tassets.zip
    # as an object in re-linked tclsh
    mv ${HERE}/tcl/macosx/tclsh ${HERE}/tcl/macosx/tclsh.orig
    ln -s tassets.zip zembed
    make -C ${HERE}/tcl/macosx -f Makefile tclsh \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"
................................................................................
  # fixup .../lib/tk8.6/pkgIndex.tcl since we have static wish
  cat > assets/tk8.6/pkgIndex.tcl <<'EOD'
if {[catch {package present Tcl 8.6}]} {return}
package ifneeded Tk 8.6.9 {load {} Tk}
EOD
  # build ZIP to be embedded for vanillawish
  rm -f assets.zip
  ${PFX_HERE}/bin/tclsh8.6 minizip.tcl assets.zip assets assets/
  if test "$ACTION" = "ebuild" ; then
    # now wrap to single-file binary vanillawish by embedding assets.zip
    # as an object in re-linked wish
    mv ${HERE}/sdl2tk.static/macosx/wish ${HERE}/sdl2tk.static/macosx/wish.orig
    ln -s assets.zip zembed
    make -C ${HERE}/sdl2tk.static/macosx -f Makefile wish \
      ZEMBED_OBJ="-sectcreate __TEXT __zipfs $(pwd)/zembed"

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

133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
....
1346
1347
1348
1349
1350
1351
1352















1353
1354
1355
1356
1357
1358
1359
....
1488
1489
1490
1491
1492
1493
1494

1495
1496
1497
1498
1499
1500
1501
....
1640
1641
1642
1643
1644
1645
1646

1647
1648
1649
1650
1651
1652
1653

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk blt jpeg-turbo 3dcanvas"
SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclx tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral tclepeg xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tdkwin32 snap7 libmodbus"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e "s@-shared@-shared -Wl,--kill-at@g" Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail
















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll
................................................................................
  cp -rp ${PFX_HERE}/lib/lmdb* assets
  cp -rp ${PFX_HERE}/lib/DiffUtil* assets
  cp -rp ${PFX_HERE}/lib/parser* assets
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/win32* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets

  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  cp -p ${PFX_HERE}/lib/modbus*.dll tassets/modbus*
  cp -rp ${PFX_HERE}/lib/tserialport* tassets
  cp -rp ${PFX_HERE}/lib/topcua* tassets
  cp -rp ${PFX_HERE}/lib/parse_args* tassets
  cp -rp ${PFX_HERE}/lib/tkvlc* tassets
  cp -rp ${PFX_HERE}/lib/tclJBlend* tassets
  cp -rp ${AWDIR}/assets/tdbcjdbc* tassets

  # add sdx
  cp -rp ${HERE}/tclkit/sdx/lib/app-sdx tassets/app-sdx2.0
  cp -rp ${HERE}/tclkit/sdx/lib/sdx tassets/sdx1.0
  cp -rp ${HERE}/tclkit/sdx/lib/starsync tassets/starsync1.0
  cp -rp ${HERE}/tclkit/sdx/lib/stringfileinfo tassets/stringfileinfo0.2
  echo > tassets/sdx 'package require starkit ; package require app-sdx'
  if test "$ACTION" = "ebuild" ; then








|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>







 







>








133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
....
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
....
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
....
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk blt jpeg-turbo 3dcanvas"
SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclx tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral tclepeg xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tdkwin32 snap7 libmodbus"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend twv"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e "s@-shared@-shared -Wl,--kill-at@g" Makefile
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build twv ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd twv
  test -e build-stamp && echo >&3 "already done" && exit 0
  make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
    TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub86" TARGET_OS=Windows_NT || exit 1
  install -d ${PFX_HERE}/lib/twv0.1
  install -m 755 libtwv.dll ${PFX_HERE}/lib/twv0.1
  install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll
................................................................................
  cp -rp ${PFX_HERE}/lib/lmdb* assets
  cp -rp ${PFX_HERE}/lib/DiffUtil* assets
  cp -rp ${PFX_HERE}/lib/parser* assets
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/win32* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/twv* assets
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  cp -p ${PFX_HERE}/lib/modbus*.dll tassets/modbus*
  cp -rp ${PFX_HERE}/lib/tserialport* tassets
  cp -rp ${PFX_HERE}/lib/topcua* tassets
  cp -rp ${PFX_HERE}/lib/parse_args* tassets
  cp -rp ${PFX_HERE}/lib/tkvlc* tassets
  cp -rp ${PFX_HERE}/lib/tclJBlend* tassets
  cp -rp ${AWDIR}/assets/tdbcjdbc* tassets
  cp -rp ${PFX_HERE}/lib/twv* tassets
  # add sdx
  cp -rp ${HERE}/tclkit/sdx/lib/app-sdx tassets/app-sdx2.0
  cp -rp ${HERE}/tclkit/sdx/lib/sdx tassets/sdx1.0
  cp -rp ${HERE}/tclkit/sdx/lib/starsync tassets/starsync1.0
  cp -rp ${HERE}/tclkit/sdx/lib/stringfileinfo tassets/stringfileinfo0.2
  echo > tassets/sdx 'package require starkit ; package require app-sdx'
  if test "$ACTION" = "ebuild" ; then

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

125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
....
1326
1327
1328
1329
1330
1331
1332















1333
1334
1335
1336
1337
1338
1339
....
1468
1469
1470
1471
1472
1473
1474

1475
1476
1477
1478
1479
1480
1481
....
1620
1621
1622
1623
1624
1625
1626

1627
1628
1629
1630
1631
1632
1633

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk blt jpeg-turbo 3dcanvas"
SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclx tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral tclepeg xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tdkwin32 snap7 libmodbus"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail
















echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll
................................................................................
  cp -rp ${PFX_HERE}/lib/lmdb* assets
  cp -rp ${PFX_HERE}/lib/DiffUtil* assets
  cp -rp ${PFX_HERE}/lib/parser* assets
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/win32* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets

  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  cp -p ${PFX_HERE}/lib/modbus*.dll tassets/modbus*
  cp -rp ${PFX_HERE}/lib/tserialport* tassets
  cp -rp ${PFX_HERE}/lib/topcua* tassets
  cp -rp ${PFX_HERE}/lib/parse_args* tassets
  cp -rp ${PFX_HERE}/lib/tkvlc* tassets
  cp -rp ${PFX_HERE}/lib/tclJBlend* tassets
  cp -rp ${AWDIR}/assets/tdbcjdbc* tassets

  # add sdx
  cp -rp ${HERE}/tclkit/sdx/lib/app-sdx tassets/app-sdx2.0
  cp -rp ${HERE}/tclkit/sdx/lib/sdx tassets/sdx1.0
  cp -rp ${HERE}/tclkit/sdx/lib/starsync tassets/starsync1.0
  cp -rp ${HERE}/tclkit/sdx/lib/stringfileinfo tassets/stringfileinfo0.2
  echo > tassets/sdx 'package require starkit ; package require app-sdx'
  if test "$ACTION" = "ebuild" ; then








|







 







>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







>







 







>








125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
....
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
....
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
....
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan TclCurl sdl2tk blt jpeg-turbo 3dcanvas"
SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclx tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral tclepeg xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler tdkwin32 snap7 libmodbus"
SUBDIRS="${SUBDIRS} tserialport topcua parse_args tkvlc tclJBlend twv"

ACTION="$1"
if test -z "$ACTION" ; then
  ACTION=build
fi

clean_build_stamps() {
................................................................................
  DESTDIR=${HERE} ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  make || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build twv ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd twv
  test -e build-stamp && echo >&3 "already done" && exit 0
  make TCL_CFLAGS="-I${PFX_HERE}/include -DUSE_TCL_STUBS=1" \
    TCL_LDFLAGS="-L${PFX_HERE}/lib -ltclstub86" TARGET_OS=Windows_NT || exit 1
  install -d ${PFX_HERE}/lib/twv0.1
  install -m 755 libtwv.dll ${PFX_HERE}/lib/twv0.1
  install -m 644 pkgIndex.tcl ${PFX_HERE}/lib/twv0.1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "strip binaries ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  set -x
  $STRIP ${PFX_HERE}/bin/*.exe ${PFX_HERE}/lib/*/*.dll
................................................................................
  cp -rp ${PFX_HERE}/lib/lmdb* assets
  cp -rp ${PFX_HERE}/lib/DiffUtil* assets
  cp -rp ${PFX_HERE}/lib/parser* assets
  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/win32* assets
  cp -rp ${PFX_HERE}/lib/tclJBlend* assets
  cp -rp ${AWDIR}/assets/tdbcjdbc* assets
  cp -rp ${PFX_HERE}/lib/twv* assets
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
................................................................................
  cp -p ${PFX_HERE}/lib/modbus*.dll tassets/modbus*
  cp -rp ${PFX_HERE}/lib/tserialport* tassets
  cp -rp ${PFX_HERE}/lib/topcua* tassets
  cp -rp ${PFX_HERE}/lib/parse_args* tassets
  cp -rp ${PFX_HERE}/lib/tkvlc* tassets
  cp -rp ${PFX_HERE}/lib/tclJBlend* tassets
  cp -rp ${AWDIR}/assets/tdbcjdbc* tassets
  cp -rp ${PFX_HERE}/lib/twv* tassets
  # add sdx
  cp -rp ${HERE}/tclkit/sdx/lib/app-sdx tassets/app-sdx2.0
  cp -rp ${HERE}/tclkit/sdx/lib/sdx tassets/sdx1.0
  cp -rp ${HERE}/tclkit/sdx/lib/starsync tassets/starsync1.0
  cp -rp ${HERE}/tclkit/sdx/lib/stringfileinfo tassets/stringfileinfo0.2
  echo > tassets/sdx 'package require starkit ; package require app-sdx'
  if test "$ACTION" = "ebuild" ; then

Fossil version [85f4869078] 2020-07-10 12:49:00