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

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

Overview
Comment:add nsf and xotcl to [undroidwish] build
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 6718184d53cc8a7b891312b8e202bd6bbb59f18f
User & Date: chw 2016-11-16 05:56:09.479
Context
2016-11-16
07:55
add ukaz to assets folder check-in: 35c4f510aa user: chw tags: trunk
05:56
add nsf and xotcl to [undroidwish] build check-in: 6718184d53 user: chw tags: trunk
2016-11-15
06:03
update XOTcl to version 1.6.8 check-in: 928d865dd1 user: chw tags: trunk
Changes
Unified Diff Ignore Whitespace Patch
jni/xotcl/apps/actiweb/AgentClient.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/Counter.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/Counter2.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/Counter3.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/Counter4.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/FormsWithState.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/MC.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/Receiver.xotcl became executable.
︙︙
jni/xotcl/apps/actiweb/univ/UNIVERSAL.xotcl became executable.
︙︙
jni/xotcl/apps/comm/ftp.xotcl became executable.
︙︙
jni/xotcl/apps/comm/get-regression-nb.xotcl became executable.
︙︙
jni/xotcl/apps/comm/link-checker.xotcl became executable.
︙︙
jni/xotcl/apps/comm/secure-webclient.xotcl became executable.
︙︙
jni/xotcl/apps/comm/secure-webserver.xotcl became executable.
︙︙
jni/xotcl/apps/comm/webclient.xotcl became executable.
jni/xotcl/apps/comm/webserver.xotcl became executable.
︙︙
jni/xotcl/apps/persistence/persistenceTest.xotcl became executable.
︙︙
jni/xotcl/apps/utils/xotclsh.in became executable.
︙︙
jni/xotcl/apps/utils/xowish.in became executable.
︙︙
jni/xotcl/library/lib/make.xotcl became executable.
︙︙
Changes to undroid/build-undroidwish-generic.sh.
︙︙
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








63
64
65
66
67
68
69
70
71
72
73
74
75
76
77

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
1013
1014
1015
1016
1017
1018
1019




































1020
1021
1022
1023
1024
1025
1026

    ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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* ${PFX_HERE}/lib/*/*.so








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








1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure  \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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* ${PFX_HERE}/lib/*/*.so
︙︙
1113
1114
1115
1116
1117
1118
1119


1120
1121
1122
1123
1124
1125
1126

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
Changes to undroid/build-undroidwish-linux32.sh.
︙︙
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
1016
1017
1018
1019
1020
1021
1022




































1023
1024
1025
1026
1027
1028
1029

    ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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* ${PFX_HERE}/lib/*/*.so








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








1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=i586-linux-gnu \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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* ${PFX_HERE}/lib/*/*.so
︙︙
1116
1117
1118
1119
1120
1121
1122


1123
1124
1125
1126
1127
1128
1129

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
Changes to undroid/build-undroidwish-linux64.sh.
︙︙
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint tcl-augeas"
SUBDIRS="${SUBDIRS} snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
1016
1017
1018
1019
1020
1021
1022




































1023
1024
1025
1026
1027
1028
1029

    ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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* ${PFX_HERE}/lib/*/*.so








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








1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=x86_64-linux-gnu \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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* ${PFX_HERE}/lib/*/*.so
︙︙
1116
1117
1118
1119
1120
1121
1122


1123
1124
1125
1126
1127
1128
1129

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
Changes to undroid/build-undroidwish-win32.sh.
︙︙
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

  export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg"

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

clean_build_stamps() {








|








104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

  export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
970
971
972
973
974
975
976




































977
978
979
980
981
982
983

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || 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








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








970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh ${PFX_HERE}/lib/xotcl*.dll
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh ${PFX_HERE}/lib/nsf*.dll
  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
︙︙
1063
1064
1065
1066
1067
1068
1069


1070
1071
1072
1073
1074
1075
1076

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
Changes to undroid/build-undroidwish-win64.sh.
︙︙
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112

  export STRIP AR RANLIB CC CXX RC NM
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg"

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

clean_build_stamps() {








|








98
99
100
101
102
103
104
105
106
107
108
109
110
111
112

  export STRIP AR RANLIB CC CXX RC NM
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl freetype SDL2 sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
960
961
962
963
964
965
966




































967
968
969
970
971
972
973

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || 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








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








960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh ${PFX_HERE}/lib/xotcl*.dll
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh ${PFX_HERE}/lib/nsf*.dll
  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
︙︙
1053
1054
1055
1056
1057
1058
1059


1060
1061
1062
1063
1064
1065
1066

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo sdl2tk*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
Changes to undroid/build-vanilla-generic.sh.
︙︙
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
964
965
966
967
968
969
970




































971
972
973
974
975
976
977

    ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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








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








964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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
︙︙
1065
1066
1067
1068
1069
1070
1071


1072
1073
1074
1075
1076
1077
1078

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
1145
1146
1147
1148
1149
1150
1151


1152
1153
1154
1155
1156
1157
1158

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets


  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )








>
>








1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets
  cp -rp ${PFX_HERE}/lib/xotcl* tassets
  cp -rp ${PFX_HERE}/lib/nsf* tassets
  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )
︙︙
Changes to undroid/build-vanilla-linux32.sh.
︙︙
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
964
965
966
967
968
969
970




































971
972
973
974
975
976
977

    ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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








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








964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=i586-linux-gnu \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=i586-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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
︙︙
1065
1066
1067
1068
1069
1070
1071


1072
1073
1074
1075
1076
1077
1078

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
1145
1146
1147
1148
1149
1150
1151


1152
1153
1154
1155
1156
1157
1158

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets


  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )








>
>








1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets
  cp -rp ${PFX_HERE}/lib/xotcl* tassets
  cp -rp ${PFX_HERE}/lib/nsf* tassets
  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )
︙︙
Changes to undroid/build-vanilla-linux64.sh.
︙︙
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg"

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

clean_build_stamps() {








|








64
65
66
67
68
69
70
71
72
73
74
75
76
77
78

export STRIP AR RANLIB CC CXX RC NM

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk v4l2 tkhtml"
SUBDIRS="${SUBDIRS} tcluvc dbus-tcl dbus-intf tclx libdmtx ZBar zint"
SUBDIRS="${SUBDIRS} tcl-augeas tktray snack tkvnc tksvg VecTcl tclral"
SUBDIRS="${SUBDIRS} libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
964
965
966
967
968
969
970




































971
972
973
974
975
976
977

    ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads || exit 1
  make binaries || 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








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








964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013

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

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=x86_64-linux-gnu \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=x86_64-linux-gnu --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/unix --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh
  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
︙︙
1065
1066
1067
1068
1069
1070
1071


1072
1073
1074
1075
1076
1077
1078

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
1145
1146
1147
1148
1149
1150
1151


1152
1153
1154
1155
1156
1157
1158

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets


  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )








>
>








1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets
  cp -rp ${PFX_HERE}/lib/xotcl* tassets
  cp -rp ${PFX_HERE}/lib/nsf* tassets
  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/*zlibtcl* tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    head -2 ${PFX_HERE}/lib/Img*/pkgIndex.tcl > pkgIndex.tcl
  )
︙︙
Changes to undroid/build-vanilla-win32.sh.
︙︙
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119

  export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg"

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

clean_build_stamps() {








|








105
106
107
108
109
110
111
112
113
114
115
116
117
118
119

  export STRIP AR RANLIB CC CXX RC NM TWAPI_LDFLAGS
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
930
931
932
933
934
935
936




































937
938
939
940
941
942
943

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || 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








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








930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=i386-windows-mingw32 \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh ${PFX_HERE}/lib/xotcl*.dll
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=i386-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh ${PFX_HERE}/lib/nsf*.dll
  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
︙︙
1025
1026
1027
1028
1029
1030
1031


1032
1033
1034
1035
1036
1037
1038

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
1107
1108
1109
1110
1111
1112
1113


1114
1115
1116
1117
1118
1119
1120

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets


  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    echo  > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \'
    echo >> pkgIndex.tcl '  [list load [file join $dir zlibtcl1281.dll]]'








>
>








1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets
  cp -rp ${PFX_HERE}/lib/xotcl* tassets
  cp -rp ${PFX_HERE}/lib/nsf* tassets
  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    echo  > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \'
    echo >> pkgIndex.tcl '  [list load [file join $dir zlibtcl1281.dll]]'
︙︙
Changes to undroid/build-vanilla-win64.sh.
︙︙
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113

  export STRIP AR RANLIB CC CXX RC NM
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg"

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

clean_build_stamps() {








|








99
100
101
102
103
104
105
106
107
108
109
110
111
112
113

  export STRIP AR RANLIB CC CXX RC NM
fi

SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls"
SUBDIRS="${SUBDIRS} Memchan trf TclCurl sdl2tk blt"
SUBDIRS="${SUBDIRS} 3dcanvas tkimg tktable tktreectrl tkpath itk tkhtml twapi"
SUBDIRS="${SUBDIRS} tclwmf libdmtx ZBar zint snack winico tkvnc tksvg"
SUBDIRS="${SUBDIRS} VecTcl tclral libjpeg tclepeg xotcl nsf"

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

clean_build_stamps() {
︙︙
920
921
922
923
924
925
926




































927
928
929
930
931
932
933

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || 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








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








920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969

    --with-tcl=${HERE}/tcl/win --enable-threads || exit 1
  perl -pi -e 's@-ljpeg@-L../libjpeg -ljpeg@g' Makefile
  make binaries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build xotcl ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd xotcl
  test -e build-stamp && echo >&3 "already done" && exit 0
  CFLAGS="-I${HERE}/tdom/expat" ./configure --build=x86_64-windows-mingw32 \
    --prefix=${PFX} --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath --without-gdbm --without-aolserver \
    --with-actiweb=yes --with-xotclsh=no --with-xowish=no || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/xotcl*/*.a
  rm -f ${PFX_HERE}/lib/xotcl*.sh ${PFX_HERE}/lib/xotcl*.dll
  touch build-stamp
  echo >&3 "done"
) || fail

echo -n "build nsf ... "
(
  exec 3>&1
  exec >> build.log 2>&1
  cd nsf
  test -e build-stamp && echo >&3 "already done" && exit 0
  ./configure --build=x86_64-windows-mingw32 --prefix=${PFX} \
    --with-tcl=${HERE}/tcl/win --enable-threads \
    --disable-rpath || exit 1
  make binaries libraries || exit 1
  make install-binaries install-libraries install-xotcl-libraries \
    DESTDIR=${HERE} || exit 1
  rm -f ${PFX_HERE}/lib/nsf*/*.a
  rm -f ${PFX_HERE}/lib/nsf*.sh ${PFX_HERE}/lib/nsf*.dll
  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
︙︙
1015
1016
1017
1018
1019
1020
1021


1022
1023
1024
1025
1026
1027
1028

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets


  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'








>
>








1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066

  cp -rp ${PFX_HERE}/lib/vectcl0* assets
  cp -rp ${PFX_HERE}/lib/vectcltk0* assets
  cp -rp ${AWDIR}/assets/vectcl*/demo assets/vectcltk*
  cp -rp ${PFX_HERE}/lib/WavReader* assets
  cp -rp ${PFX_HERE}/lib/ral* assets
  cp -rp ${AWDIR}/assets/ralutil* assets
  cp -rp ${PFX_HERE}/lib/tclepeg* assets
  cp -rp ${PFX_HERE}/lib/xotcl* assets
  cp -rp ${PFX_HERE}/lib/nsf* assets
  # add shortcuts providing builtin:widget, builtin:tksqlite, etc.
  (
    cd assets
    echo > widget \
      'source [file dirname [info script]]/'$(echo tk8*)'/demos/widget'
    echo > tksqlite \
      'source [file dirname [info script]]/'$(echo tksqlite*)'/tksqlite.tcl'
︙︙
1097
1098
1099
1100
1101
1102
1103


1104
1105
1106
1107
1108
1109
1110

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets


  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    echo  > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \'
    echo >> pkgIndex.tcl '  [list load [file join $dir zlibtcl1281.dll]]'








>
>








1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150

  cp -rp ${PFX_HERE}/lib/snack* tassets
  rm -f tassets/snack*/libsnack* tassets/snack*/snack.tcl
  cp -rp ${PFX_HERE}/lib/vectcl0* tassets
  cp -rp ${PFX_HERE}/lib/WavReader* tassets
  cp -rp ${PFX_HERE}/lib/ral* tassets
  cp -rp ${AWDIR}/assets/ralutil* tassets
  cp -rp ${PFX_HERE}/lib/tclepeg* tassets
  cp -rp ${PFX_HERE}/lib/xotcl* tassets
  cp -rp ${PFX_HERE}/lib/nsf* tassets
  # zlibtcl from tkimg needed for trf
  mkdir -p tassets/zlibtcl1.2.8.1
  cp -p ${PFX_HERE}/lib/Img*/zlibtcl*.dll tassets/zlibtcl*
  (
    cd tassets/zlibtcl*
    echo  > pkgIndex.tcl 'package ifneeded zlibtcl 1.2.8.1 \'
    echo >> pkgIndex.tcl '  [list load [file join $dir zlibtcl1281.dll]]'
︙︙
Fossil version [bcbf150dc2] 2025-06-30 17:00:42