Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | add snap7 and libmodbus to macosx build scripts |
---|---|
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
01b76f6c19bfd7d08a152f6f1bcaf087 |
User & Date: | chw 2019-07-13 13:56:11.754 |
Context
2019-07-13
| ||
20:55 | better error handling w.r.t. check-in [f125b3dc59] check-in: 4dcaf5f047 user: chw tags: trunk | |
13:56 | add snap7 and libmodbus to macosx build scripts check-in: 01b76f6c19 user: chw tags: trunk | |
13:15 | add build support for macosx to snap7 check-in: 165f5d2471 user: chw tags: trunk | |
Changes
Changes to undroid/build-undroidwish-macosx.sh.
︙ | ︙ | |||
89 90 91 92 93 94 95 | SUBDIRS="${SUBDIRS} tls libwebsockets" SUBDIRS="${SUBDIRS} Memchan TclCurl freetype SDL2 sdl2tk blt 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 mpexpr" SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl" | | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | SUBDIRS="${SUBDIRS} tls libwebsockets" SUBDIRS="${SUBDIRS} Memchan TclCurl freetype SDL2 sdl2tk blt 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 mpexpr" SUBDIRS="${SUBDIRS} tclcsv tkzinc libffi ffidl tcl-lmdb DiffUtilTcl" SUBDIRS="${SUBDIRS} tclparser tclcompiler snap7 libmodbus tserialport" SUBDIRS="${SUBDIRS} topcua parse_args tkvlc tclJBlend" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
133 134 135 136 137 138 139 140 141 142 143 144 145 146 | xotcl|nsf) rm -f ${i}/*.o ${i}/generic/stubs*/*.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; libwebsockets) rm -f ${i}/build/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac | > > > | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 | xotcl|nsf) rm -f ${i}/*.o ${i}/generic/stubs*/*.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; snap7) rm -f ${i}/build/osx/build-stamp ;; libwebsockets) rm -f ${i}/build/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac |
︙ | ︙ | |||
259 260 261 262 263 264 265 266 267 268 269 270 271 272 | if test "$ACTION" = "distclean" ; then rm -rf libwebsockets/build else make -C libwebsockets/build ${ACTION} || true fi ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > | 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | if test "$ACTION" = "distclean" ; then rm -rf libwebsockets/build else make -C libwebsockets/build ${ACTION} || true fi ) || true ;; snap7) ( exec >> build.log 2>&1 make -C snap7/build/osx -f osx.mk clean || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 | ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/macosx --enable-threads || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build tserialport ... " ( exec 3>&1 exec >> build.log 2>&1 cd tserialport test -e build-stamp && echo >&3 "already done" && exit 0 | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1320 1321 1322 1323 1324 1325 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 1355 1356 1357 1358 1359 1360 | ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/macosx --enable-threads || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build snap7 ... " ( exec 3>&1 exec >> build.log 2>&1 cd snap7/build/osx test -e build-stamp && echo >&3 "already done" && exit 0 make -f osx.mk || exit 1 $STRIP ../bin/*.dylib || true touch build-stamp echo >&3 "done" ) || fail echo -n "build libmodbus ... " ( exec 3>&1 exec >> build.log 2>&1 cd libmodbus test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} ./configure --prefix=${PFX} --disable-tests \ --disable-static --enable-shared --without-documentation || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 $STRIP ${PFX_HERE}/lib/libmodbus.dylib || true touch build-stamp echo >&3 "done" ) || fail echo -n "build tserialport ... " ( exec 3>&1 exec >> build.log 2>&1 cd tserialport test -e build-stamp && echo >&3 "already done" && exit 0 |
︙ | ︙ | |||
1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 | cp -rp ${AWDIR}/assets/tksqlite* assets cp -rp ${AWDIR}/assets/twdbgi* assets cp -rp ${AWDIR}/assets/upnp* assets cp -rp ${AWDIR}/assets/ukaz* assets cp -rp ${AWDIR}/assets/wibble* assets cp -rp ${AWDIR}/assets/stardom* assets cp -rp ${AWDIR}/assets/modbus* assets cp -rp ${AWDIR}/assets/snap7* assets # BLT fixups cp -p ${PFX_HERE}/lib/blt*/libBLT* assets/blt* cp -p ${PFX_HERE}/lib/blt*/pkgIndex* assets/blt* # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/tcluvc* ; then | > > | 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 | cp -rp ${AWDIR}/assets/tksqlite* assets cp -rp ${AWDIR}/assets/twdbgi* assets cp -rp ${AWDIR}/assets/upnp* assets cp -rp ${AWDIR}/assets/ukaz* assets cp -rp ${AWDIR}/assets/wibble* assets cp -rp ${AWDIR}/assets/stardom* assets cp -rp ${AWDIR}/assets/modbus* assets cp -p ${PFX_HERE}/lib/libmodbus.dylib assets/modbus* cp -rp ${AWDIR}/assets/snap7* assets cp -p snap7/build/bin/libsnap7* assets/snap7* # BLT fixups cp -p ${PFX_HERE}/lib/blt*/libBLT* assets/blt* cp -p ${PFX_HERE}/lib/blt*/pkgIndex* assets/blt* # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/tcluvc* ; then |
︙ | ︙ |
Changes to undroid/build-vanilla-macosx.sh.
︙ | ︙ | |||
89 90 91 92 93 94 95 | SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" 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" | | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | SUBDIRS="tcl libressl zlib curl tcludp tdom tclvfs tclkit trofs tbcload tls" 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 snap7 libmodbus tserialport" SUBDIRS="${SUBDIRS} topcua parse_args tkvlc tclJBlend twv" ACTION="$1" if test -z "$ACTION" ; then ACTION=build fi clean_build_stamps() { |
︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 | xotcl|nsf) rm -f ${i}/*.o ${i}/generic/stubs*/*.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } | > > > | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 | xotcl|nsf) rm -f ${i}/*.o ${i}/generic/stubs*/*.o rm -f ${i}/build-stamp ;; mpexpr) rm -f ${i}/unix/build-stamp ;; snap7) rm -f ${i}/build/osx/build-stamp ;; *) rm -f ${i}/build-stamp ;; esac done } |
︙ | ︙ | |||
250 251 252 253 254 255 256 257 258 259 260 261 262 263 | tdom) ( exec >> build.log 2>&1 make -C tdom ${ACTION} || true make -C tdom/extensions/tnc ${ACTION} || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac | > > > > > > | 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | tdom) ( exec >> build.log 2>&1 make -C tdom ${ACTION} || true make -C tdom/extensions/tnc ${ACTION} || true ) || true ;; snap7) ( exec >> build.log 2>&1 make -C snap7/build/osx -f osx.mk clean || true ) || true ;; *) ( exec >> build.log 2>&1 make -C $i ${ACTION} || true ) || true ;; esac |
︙ | ︙ | |||
1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 | ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/macosx --enable-threads || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build tserialport ... " ( exec 3>&1 exec >> build.log 2>&1 cd tserialport test -e build-stamp && echo >&3 "already done" && exit 0 | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 | ./configure --prefix=${PFX} \ --with-tcl=${HERE}/tcl/macosx --enable-threads || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 touch build-stamp echo >&3 "done" ) || fail echo -n "build snap7 ... " ( exec 3>&1 exec >> build.log 2>&1 cd snap7/build/osx test -e build-stamp && echo >&3 "already done" && exit 0 make -f osx.mk || exit 1 $STRIP ../bin/*.dylib || true touch build-stamp echo >&3 "done" ) || fail echo -n "build libmodbus ... " ( exec 3>&1 exec >> build.log 2>&1 cd libmodbus test -e build-stamp && echo >&3 "already done" && exit 0 DESTDIR=${HERE} ./configure --prefix=${PFX} --disable-tests \ --disable-static --enable-shared --without-documentation || exit 1 make || exit 1 make install DESTDIR=${HERE} || exit 1 $STRIP ${PFX_HERE}/lib/libmodbus.dylib || true touch build-stamp echo >&3 "done" ) || fail echo -n "build tserialport ... " ( exec 3>&1 exec >> build.log 2>&1 cd tserialport test -e build-stamp && echo >&3 "already done" && exit 0 |
︙ | ︙ | |||
1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 | cp -rp ${AWDIR}/assets/tksqlite* assets cp -rp ${AWDIR}/assets/twdbgi* assets cp -rp ${AWDIR}/assets/upnp* assets cp -rp ${AWDIR}/assets/ukaz* assets cp -rp ${AWDIR}/assets/wibble* assets cp -rp ${AWDIR}/assets/stardom* assets cp -rp ${AWDIR}/assets/modbus* assets cp -rp ${AWDIR}/assets/snap7* assets # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets | > > | 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 | cp -rp ${AWDIR}/assets/tksqlite* assets cp -rp ${AWDIR}/assets/twdbgi* assets cp -rp ${AWDIR}/assets/upnp* assets cp -rp ${AWDIR}/assets/ukaz* assets cp -rp ${AWDIR}/assets/wibble* assets cp -rp ${AWDIR}/assets/stardom* assets cp -rp ${AWDIR}/assets/modbus* assets cp -p ${PFX_HERE}/lib/libmodbus.dylib assets/modbus* cp -rp ${AWDIR}/assets/snap7* assets cp -p snap7/build/bin/libsnap7* assets/snap7* # some demos cp -p ${AWDIR}/assets/tkimg*/demo.tcl assets/Img* cp -rp ${AWDIR}/assets/Canvas3d*/demo assets/Canvas3d* if test -d assets/tcluvc* ; then cp -rp ${HERE}/tcluvc*/demos assets/tcluvc* fi cp -rp ${PFX_HERE}/lib/vectcl0* assets |
︙ | ︙ |