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

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: f0053670cc0d396f9e42d91a1c280c284212d1da
User & Date: chw 2020-01-05 20:01:50.101
Context
2020-01-06
19:29
merge with trunk check-in: 1303438323 user: chw tags: wtf-8-experiment
2020-01-05
20:01
merge with trunk check-in: f0053670cc user: chw tags: wtf-8-experiment
20:00
build Rtcl package on openbsd, too check-in: e1801d3fa1 user: chw tags: trunk
2020-01-04
21:00
merge with trunk check-in: dd1264525a user: chw tags: wtf-8-experiment
Changes
Unified Diff Ignore Whitespace Patch
Changes to undroid/build-undroidwish-openbsd.sh.
︙︙
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus parse_args"
SUBDIRS="${SUBDIRS} tserialport topcua tkvlc Tix"
SUBDIRS="${SUBDIRS} openjpeg imgjp2"

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

clean_build_stamps() {








|








85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

SUBDIRS="${SUBDIRS} 3dcanvas tkimg trf tktable tktreectrl tkpath itk v4l2"
SUBDIRS="${SUBDIRS} tkhtml dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus parse_args"
SUBDIRS="${SUBDIRS} tserialport topcua tkvlc Tix"
SUBDIRS="${SUBDIRS} openjpeg imgjp2 Rtcl"

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

clean_build_stamps() {
︙︙
1569
1570
1571
1572
1573
1574
1575














1576
1577
1578
1579
1580
1581
1582

      ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
        --with-tk=${HERE}/sdl2tk/sdl --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/sdl2wish* \








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








1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596

      ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
        --with-tk=${HERE}/sdl2tk/sdl --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 Rtcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd Rtcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
    --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/sdl2wish* \
︙︙
1714
1715
1716
1717
1718
1719
1720

1721
1722
1723
1724
1725
1726
1727

  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/Tix* assets
  cp -rp ${PFX_HERE}/lib/imgjp2* assets

  cp -rp ${AWDIR}/assets/ooxml* assets
  cp -rp ${AWDIR}/assets/yeti* assets
  cp -rp ${AWDIR}/assets/calc* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \








>








1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742

  cp -rp ${PFX_HERE}/lib/tclcompiler* assets
  cp -rp ${PFX_HERE}/lib/parse_args* assets
  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/Tix* assets
  cp -rp ${PFX_HERE}/lib/imgjp2* assets
  cp -rp ${PFX_HERE}/lib/Rtcl* assets
  cp -rp ${AWDIR}/assets/ooxml* assets
  cp -rp ${AWDIR}/assets/yeti* assets
  cp -rp ${AWDIR}/assets/calc* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
︙︙
Changes to undroid/build-vanilla-openbsd.sh.
︙︙
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus parse_args"
SUBDIRS="${SUBDIRS} tserialport topcua tkvlc twv Tix"
SUBDIRS="${SUBDIRS} openjpeg imgjp2"

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

clean_build_stamps() {








|








85
86
87
88
89
90
91
92
93
94
95
96
97
98
99

SUBDIRS="${SUBDIRS} tkimg trf tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} tclepeg tcluvc xotcl nsf vu rl_json tkdnd mpexpr"
SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl"
SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus parse_args"
SUBDIRS="${SUBDIRS} tserialport topcua tkvlc twv Tix"
SUBDIRS="${SUBDIRS} openjpeg imgjp2 Rtcl"

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

clean_build_stamps() {
︙︙
1532
1533
1534
1535
1536
1537
1538














1539
1540
1541
1542
1543
1544
1545

      ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
        --with-tk=${HERE}/sdl2tk/unix --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/*.so* \








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








1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559

      ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
        --with-tk=${HERE}/sdl2tk/unix --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 Rtcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd Rtcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX} --with-tcl=${HERE}/tcl/unix \
    --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/*.so* \
︙︙
1681
1682
1683
1684
1685
1686
1687

1688
1689
1690
1691
1692
1693
1694

  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/twv* assets
  cp -rp ${AWDIR}/undroid/tsb* assets
  cp -rp ${PFX_HERE}/lib/Tix* assets
  cp -rp ${PFX_HERE}/lib/imgjp2* assets

  cp -rp ${AWDIR}/assets/ooxml* assets
  cp -rp ${AWDIR}/assets/yeti* assets
  cp -rp ${AWDIR}/assets/calc* assets
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (








>








1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709

  cp -rp ${PFX_HERE}/lib/tserialport* assets
  cp -rp ${PFX_HERE}/lib/topcua* assets
  cp -rp ${PFX_HERE}/lib/tkvlc* assets
  cp -rp ${PFX_HERE}/lib/twv* assets
  cp -rp ${AWDIR}/undroid/tsb* assets
  cp -rp ${PFX_HERE}/lib/Tix* assets
  cp -rp ${PFX_HERE}/lib/imgjp2* assets
  cp -rp ${PFX_HERE}/lib/Rtcl* assets
  cp -rp ${AWDIR}/assets/ooxml* assets
  cp -rp ${AWDIR}/assets/yeti* assets
  cp -rp ${AWDIR}/assets/calc* assets
  # add stripped down TDK
  cp -rp ${AWDIR}/undroid/TDK assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
︙︙
Fossil version [bcbf150dc2] 2025-06-30 17:00:42