Changes In Branch feature-tkimg Excluding Merge-Ins
This is equivalent to a diff from fdef98f710 to cb3b1b20ff
2014-09-03
| ||
01:17 | Corrected typo check-in: 09c23dfa32 user: rkeene tags: trunk | |
2014-09-02
| ||
17:25 | Started adding TkImg support, seems broken so far Leaf check-in: cb3b1b20ff user: rkeene tags: feature-tkimg | |
17:24 | Clarified STATICMK4 notes in KitDLL check-in: fdef98f710 user: rkeene tags: trunk | |
2014-08-31
| ||
20:14 | Updated to support disabling KitDLL check-in: 1a0dc6637d user: rkeene tags: trunk | |
Modified .fossil-settings/ignore-glob from [5261fbbc36] to [3cebc8d371].
︙ | ︙ | |||
101 102 103 104 105 106 107 108 109 110 111 112 113 114 | tls/build.log tls/inst tls/inst/* tls/out tls/out/* tls/src tls/src/* kitdll/buildsrc/kitdll-0.0/starpack.vfs kitdll/buildsrc/kitdll-0.0/starpack.vfs/* kitdll/buildsrc/kitdll-0.0/test kitdll/buildsrc/kitdll-0.0/configure kitdll/buildsrc/kitdll-0.0/libtcl*.so kitdll/buildsrc/kitdll-0.0/Makefile kitdll/buildsrc/kitdll-0.0/*.o | > > > > > > > > > | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | tls/build.log tls/inst tls/inst/* tls/out tls/out/* tls/src tls/src/* tkimg/build tkimg/build/* tkimg/build.log tkimg/inst tkimg/inst/* tkimg/out tkimg/out/* tkimg/src tkimg/src/* kitdll/buildsrc/kitdll-0.0/starpack.vfs kitdll/buildsrc/kitdll-0.0/starpack.vfs/* kitdll/buildsrc/kitdll-0.0/test kitdll/buildsrc/kitdll-0.0/configure kitdll/buildsrc/kitdll-0.0/libtcl*.so kitdll/buildsrc/kitdll-0.0/Makefile kitdll/buildsrc/kitdll-0.0/*.o |
︙ | ︙ |
Added tkimg/build.sh version [e78262e2c7].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | #! /usr/bin/env bash if [ ! -f 'build.sh' ]; then echo 'ERROR: This script must be run from the directory it is in' >&2 exit 1 fi if [ -z "${TCLVERS}" ]; then echo 'ERROR: The TCLVERS environment variable is not set' >&2 exit 1 fi TKIMGVERS="1.4.2" TKIMGVERS_SHORT="$(echo "${TKIMGVERS}" | cut -f 1-2 -d '.')" SRC="src/tkimg-${TKIMGVERS}.tar.gz" SRCURL="http://sourceforge.net/projects/tkimg/files/tkimg/${TKIMGVERS_SHORT}/tkimg${TKIMGVERS}.tar.gz/download" BUILDDIR="$(pwd)/build/tkimg${TKIMGVERS_SHORT}" OUTDIR="$(pwd)/out" INSTDIR="$(pwd)/inst" PATCHDIR="$(pwd)/patches" TKCONFIGDIR="$(find ../tk/build -name tkConfig.sh 2>/dev/null | sed 's@/tkConfig\.sh$@@')" TKCONFIGDIR="$(cd "${TKCONFIGDIR}" 2>/dev/null && pwd)" export TKIMGVERS SRC SRCURL BUILDDIR OUTDIR INSTDIR PATCHDIR if [ -z "${TKCONFIGDIR}" ]; then echo "Unable to find Tk, aborting." >&2 exit 1 fi # Set configure options for this sub-project LDFLAGS="${LDFLAGS} ${KC_TKIMG_LDFLAGS}" CFLAGS="${CFLAGS} ${KC_TKIMG_CFLAGS}" CPPFLAGS="${CPPFLAGS} ${KC_TKIMG_CPPFLAGS}" LIBS="${LIBS} ${KC_TKIMG_LIBS}" export LDFLAGS CFLAGS CPPFLAGS LIBS rm -rf 'build' 'out' 'inst' mkdir 'build' 'out' 'inst' || exit 1 TCL_VERSION="unknown" if [ -f "${TCLCONFIGDIR}/tclConfig.sh" ]; then source "${TCLCONFIGDIR}/tclConfig.sh" fi export TCL_VERSION # Source Tk config so we know how Tk is configured source "${TKCONFIGDIR}/tkConfig.sh" if [ ! -f "${SRC}" ]; then mkdir 'src' >/dev/null 2>/dev/null if [ ! -d 'buildsrc' ]; then rm -f "${SRC}.tmp" wget -O "${SRC}.tmp" "${SRCURL}" || exit 1 mv "${SRC}.tmp" "${SRC}" fi fi ( cd 'build' || exit 1 if [ ! -d '../buildsrc' ]; then gzip -dc "../${SRC}" | tar -xf - else cp -rp ../buildsrc/* './' fi # Apply required patches cd "${BUILDDIR}" || exit 1 for patch in "${PATCHDIR}/all"/tkimg-${TKIMGVERS}-*.diff "${PATCHDIR}/${TCL_VERSION}"/tkimg-${TKIMGVERS}-*.diff; do if [ ! -f "${patch}" ]; then continue fi echo "Applying: ${patch}" ${PATCH:-patch} -p1 < "${patch}" done # Try to build as a shared object if requested if [ "${STATICTKIMG}" = "0" ]; then tryopts="--enable-shared --disable-shared" elif [ "${STATICTKIMG}" = "-1" ]; then # Require shared object if requested tryopts="--enable-shared" else # Default to building statically tryopts="--disable-shared" fi SAVE_CFLAGS="${CFLAGS}" for tryopt in $tryopts __fail__; do # Clean up, if needed make distclean >/dev/null 2>/dev/null rm -rf "${INSTDIR}" mkdir "${INSTDIR}" if [ "${tryopt}" = "__fail__" ]; then exit 1 fi if [ "${tryopt}" == "--enable-shared" ]; then isshared="1" else isshared="0" fi # If build a static tkimg for KitDLL, ensure that we use PIC # so that it can be linked into the shared object if [ "${isshared}" = "0" -a "${KITTARGET}" = "kitdll" ]; then CFLAGS="${SAVE_CFLAGS} -fPIC" else CFLAGS="${SAVE_CFLAGS}" fi find . -name configure | while IFS='' read -r configure; do if [ "${isshared}" = '0' ]; then sed 's@USE_TCL_STUBS@XXX_TCL_STUBS@g' "${configure}" > "${configure}.new" else sed 's@XXX_TCL_STUBS@USE_TCL_STUBS@g' "${configure}" > "${configure}.new" fi cat "${configure}.new" > "${configure}" rm -f "${configure}.new" if [ "${TK_SHARED_BUILD}" = '1' ]; then sed 's@XXX_TK_STUBS@USE_TK_STUBS@g' "${configure}" > "${configure}.new" else sed 's@USE_TK_STUBS@XXX_TK_STUBS@g' "${configure}" > "${configure}.new" fi cat "${configure}.new" > "${configure}" rm -f "${configure}.new" done ( echo "Running: ./configure $tryopt --prefix=\"${INSTDIR}\" --exec-prefix=\"${INSTDIR}\" --libdir=\"${INSTDIR}/lib\" --with-tcl=\"${TCLCONFIGDIR}\" --with-tk=\"${TKCONFIGDIR}\" ${CONFIGUREEXTRA}" ./configure $tryopt --prefix="${INSTDIR}" --exec-prefix="${INSTDIR}" --libdir="${INSTDIR}/lib" --with-tcl="${TCLCONFIGDIR}" --with-tk="${TKCONFIGDIR}" ${CONFIGUREEXTRA} echo "Running: ${MAKE:-make}" ${MAKE:-make} || exit 1 echo "Running: ${MAKE:-make} install" ${MAKE:-make} install || exit 1 ) || continue break done # Create VFS-insert cp -r "${INSTDIR}/lib" "${OUTDIR}" || exit 1 find "${OUTDIR}" -name '*.a' -type f | xargs rm -f exit 0 ) || exit 1 exit 0 |
Added tkimg/patches/all/tkimg-1.4.2-fixinstall.diff version [930a9166fd].
> > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | diff -uNr tkimg1.4.orig/Makefile.in tkimg1.4-fixinstall/Makefile.in --- tkimg1.4.orig/Makefile.in 2013-11-21 16:03:12.000000000 -0600 +++ tkimg1.4-fixinstall/Makefile.in 2014-08-31 20:03:21.960077999 -0500 @@ -141,9 +141,9 @@ cat Img/exec_prefix/lib/Img/pkgIndex.tcl >> pkgIndex.tcl ; \ fi ; \ done - chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl - mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl - chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl + if test "$(SHARED_BUILD)" = "1"; then chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl; fi + if test "$(SHARED_BUILD)" = "1"; then mv pkgIndex.tcl Img/exec_prefix/lib/Img/pkgIndex.tcl; fi + if test "$(SHARED_BUILD)" = "1"; then chmod ugo+w Img/exec_prefix/lib/Img/pkgIndex.tcl; fi for p in Img/exec_prefix/lib/*.sh ; do \ sed -e 's#$(libdir)/[^/ ]*\([/ ]\)#$(LIB_RUNTIME_DIR)\1#' \ $$p > $$p.1 && mv -f $$p.1 $$p ; \ |