Overview
| Comment: | Added support for projects including subprojects |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
912b38cd97fa971c4aa9f3dcb2b2b182 |
| User & Date: | rkeene on 2014-01-03 02:53:41 |
| Other Links: | manifest | tags |
Context
|
2014-01-03
| ||
| 03:11 | Fixed bug in previous commit check-in: a154a10e1c user: rkeene tags: trunk | |
| 02:53 | Added support for projects including subprojects check-in: 912b38cd97 user: rkeene tags: trunk | |
|
2013-12-19
| ||
| 15:37 | Added Tclx build script check-in: 05cbe23afb user: rkeene tags: trunk | |
Changes
Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [0e91c1e1fd] to [ff976902bb].
| ︙ | ︙ | |||
167 168 169 170 171 172 173 174 175 176 177 178 179 180 |
DC_CHECK_FOR_WHOLE_ARCHIVE
echo '/* Dynamically generated. */' > kitInit-libs.h
libs_init_funcs=""
for projdir in ../../../*/; do
proj="`basename "${projdir}"`"
if test "${proj}" = "build"; then
continue
fi
if test "${proj}" = "kitsh"; then
continue
| > | 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 |
DC_CHECK_FOR_WHOLE_ARCHIVE
echo '/* Dynamically generated. */' > kitInit-libs.h
libs_init_funcs=""
for projdir in ../../../*/; do
proj="`basename "${projdir}"`"
subprojs="$proj"
if test "${proj}" = "build"; then
continue
fi
if test "${proj}" = "kitsh"; then
continue
|
| ︙ | ︙ | |||
199 200 201 202 203 204 205 |
projlibextra="`cat "${libfile}.linkadd"`"
fi
done
AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
hide_symbols="1"
| < | | | 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 |
projlibextra="`cat "${libfile}.linkadd"`"
fi
done
AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
hide_symbols="1"
if test "${proj}" = "tcl"; then
DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
projlibfiles="${projlibfilesnostub}"
], [
DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
projlibfiles="${projlibfiles}"
])
])
hide_symbols="0"
subprojs="`echo " $projlibfilesnostub " | sed 's@ [[^ ]]*/@ @g;s@ lib@@g;s@[[0-9\.]]*\.a@ @g;s@ sqlite @ sqlite3 @;s@ tcl @ @;s@^ *@@;s@ *$@@'`"
fi
if test "${proj}" = "mk4tcl"; then
if test -n "${projlibfiles}"; then
AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
kc_cv_feature_kit_includes_mk4tcl='1'
DC_DO_STATIC_LINK_LIBCXX
fi
subprojs=""
fi
if test "${proj}" = "tk"; then
if test "${projlibfilesnostub}" != ""; then
DC_DO_TK
AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])
if test -n "${TK_VERSION}"; then
|
| ︙ | ︙ | |||
250 251 252 253 254 255 256 |
projlibfiles="${projlibfiles}"
])
])
hide_symbols="0"
fi
| | | | > | | | | | | > | 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 |
projlibfiles="${projlibfiles}"
])
])
hide_symbols="0"
fi
subprojs=""
fi
if test "${proj}" = "tclvfs"; then
subprojs=""
fi
if test "${hide_symbols}" = "1"; then
STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
fi
dnl Do not explicitly link to Zlib, that will happen elsewhere
if test "${proj}" = "zlib"; then
continue
fi
if test -n "${subprojs}"; then
if test -n "${projlibfilesnostub}"; then
for subproj in $subprojs; do
subprojucase="`echo ${subproj} | dd conv=ucase 2>/dev/null`"
subprojtcase="`echo ${subprojucase} | cut -c 1``echo ${subproj} | cut -c 2-`"
lib_init_func="${subprojtcase}_Init"
echo "#define KIT_INCLUDES_${subprojucase}" >> kitInit-libs.h
echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
done
fi
fi
ARCHS="${ARCHS} ${projlibfiles}"
LIBS="${LIBS} ${projlibextra}"
done
|
| ︙ | ︙ |