Overview
| Comment: | Updated to include sub-directories from header files (for Win32 support)
Fixed issue with regexp used to replace refernces to -ltcl/-ltk for KitDLL SDK Fixed issue with selecting library file on Win32 Updated to pull libraries from KitSH for KitDLL SDK to avoid picking wrong file if one is already in the current directory |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | tcl-sdk-support |
| Files: | files | file ages | folders |
| SHA1: | fe142d1843af4ff1b0f41b928bb0c50733118153 |
| User & Date: | rkeene on 2011-11-14 07:10:04 |
| Other Links: | manifest | tags |
Context
|
2011-11-14
| ||
| 16:42 | Corrected typo check-in: 8d015538ad user: rkeene tags: tcl-sdk-support | |
| 07:10 |
Updated to include sub-directories from header files (for Win32 support)
Fixed issue with regexp used to replace refernces to -ltcl/-ltk for KitDLL SDK Fixed issue with selecting library file on Win32 Updated to pull libraries from KitSH for KitDLL SDK to avoid picking wrong file if one is already in the current directory check-in: fe142d1843 user: rkeene tags: tcl-sdk-support | |
| 05:01 | Added documentation on KitDLL SDK check-in: 6f5ce08b75 user: rkeene tags: tcl-sdk-support | |
Changes
Modified common/post/sdk.sh from [2a53429c2b] to [aad8b8fa3a].
12 12 13 13 rm -rf '__tmp__' 14 14 mkdir '__tmp__' 15 15 mkdir '__tmp__/include' 16 16 mkdir '__tmp__/lib' 17 17 18 18 cp 'tcl/inst/lib/tclConfig.sh' '__tmp__/lib/' 19 -cp 'tcl/inst/include'/* '__tmp__/include/' 19 +cp -rp 'tcl/inst/include'/* '__tmp__/include/' 20 20 cp 'tcl/inst/lib'/libtclstub* '__tmp__/lib/' 21 21 22 22 if [ -f 'tk/inst/lib/tkConfig.sh' ]; then 23 23 cp 'tk/inst/lib/tkConfig.sh' '__tmp__/lib/' 24 - cp 'tk/inst/include'/* '__tmp__/include/' 24 + cp -rp 'tk/inst/include'/* '__tmp__/include/' 25 25 cp 'tk/inst/lib'/libtkstub* '__tmp__/lib/' 26 26 fi 27 27 28 -cp libtclkit* '__tmp__/lib/' 28 +cp 'kitsh/build'/kitsh-*/libtclkit* '__tmp__/lib/' 29 29 30 30 ( 31 31 cd '__tmp__/lib' || exit 1 32 32 33 - for libfile in *.dll.a; do 34 - if [ ! -f "${libfile}" ]; then 33 + for kitlibfile in libtclkit*.dll libtclkit*; do 34 + if [ ! -f "${kitlibfile}" ]; then 35 35 continue 36 36 fi 37 37 38 - newlibfile="$(basename "${libfile}" .dll.a).lib" 39 - 40 - mv "${libfile}" "${newlibfile}" 41 - done 42 - 43 - for kitlibfile in libtclkit*; do 44 38 if echo "${kitlibfile}" | grep '\.tar\.gz' >/dev/null; then 45 39 continue 46 40 fi 47 41 48 42 break 49 43 done 50 44 kitlinker="$(echo "${kitlibfile}" | sed 's@^lib@-l@;s@\.[^\.]*$@@')" 51 45 52 - sed 's|'"$(dirname "$(dirname "$(pwd)")")"'/tcl/inst|${TCLKIT_SDK_DIR}|g;s|^TCL_SHARED_BUILD=.*$|TCL_SHARED_BUILD=1|;s|^TCL_LIB_FILE=.*$|TCL_LIB_FILE='"${kitlibfile}"'|;s|-ltcl[^s][a-fA-F0-9\.]*|'"${kitlinker}"'|' 'tclConfig.sh' > 'tclConfig.sh.new' 46 + sed 's|'"$(dirname "$(dirname "$(pwd)")")"'/tcl/inst|${TCLKIT_SDK_DIR}|g;s|^TCL_SHARED_BUILD=.*$|TCL_SHARED_BUILD=1|;s|^TCL_LIB_FILE=.*$|TCL_LIB_FILE='"${kitlibfile}"'|;s|-ltcl[^s][a-zA-Z0-9\.]*|'"${kitlinker}"'|' 'tclConfig.sh' > 'tclConfig.sh.new' 53 47 ( 54 48 cat << _EOF_ 55 49 if [ -z "\${TCLKIT_SDK_DIR}" ]; then 56 50 TCLKIT_SDK_DIR="./libtclkit-sdk-${TCLVERS}" 57 51 fi 58 52 59 53 _EOF_ 60 54 cat 'tclConfig.sh.new' 61 55 ) > 'tclConfig.sh' 62 56 rm -f 'tclConfig.sh.new' 63 57 64 58 if [ -f 'tkConfig.sh' ]; then 65 - sed 's|'"$(dirname "$(dirname "$(pwd)")")"'/tk/inst|${TCLKIT_SDK_DIR}|g;s|^TK_SHARED_BUILD=.*$|TK_SHARED_BUILD=1|;s|^TK_LIB_FILE=.*$|TK_LIB_FILE='"${kitlibfile}"'|;s|-ltk[^s][a-fA-F0-9\.]*|'"${kitlinker}"'|' 'tkConfig.sh' > 'tkConfig.sh.new' 59 + sed 's|'"$(dirname "$(dirname "$(pwd)")")"'/tk/inst|${TCLKIT_SDK_DIR}|g;s|^TK_SHARED_BUILD=.*$|TK_SHARED_BUILD=1|;s|^TK_LIB_FILE=.*$|TK_LIB_FILE='"${kitlibfile}"'|;s|-ltk[^s][a-zA-Z0-9\.]*|'"${kitlinker}"'|' 'tkConfig.sh' > 'tkConfig.sh.new' 66 60 ( 67 61 cat << _EOF_ 68 62 if [ -z "\${TCLKIT_SDK_DIR}" ]; then 69 63 TCLKIT_SDK_DIR="./libtclkit-sdk-${TCLVERS}" 70 64 fi 71 65 72 66 _EOF_