Check-in [912b38cd97]
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:912b38cd97fa971c4aa9f3dcb2b2b182421e6bd8
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    167   	DC_CHECK_FOR_WHOLE_ARCHIVE
   168    168   
   169    169   	echo '/* Dynamically generated. */' > kitInit-libs.h
   170    170   	libs_init_funcs=""
   171    171   
   172    172   	for projdir in ../../../*/; do
   173    173   		proj="`basename "${projdir}"`"
          174  +		subprojs="$proj"
   174    175   
   175    176   		if test "${proj}" = "build"; then
   176    177   			continue
   177    178   		fi
   178    179   
   179    180   		if test "${proj}" = "kitsh"; then
   180    181   			continue
................................................................................
   199    200   				projlibextra="`cat "${libfile}.linkadd"`"
   200    201   			fi
   201    202   		done
   202    203   
   203    204   		AC_MSG_RESULT([${projlibfilesnostub} ${projlibextra}])
   204    205   
   205    206   		hide_symbols="1"
   206         -		initialize="1"
   207    207   
   208    208   		if test "${proj}" = "tcl"; then
   209    209   			DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfilesnostub], [
   210    210   				projlibfiles="${projlibfilesnostub}"
   211    211   			], [
   212    212   				DC_TEST_WHOLE_ARCHIVE_SHARED_LIB([$ARCHS $projlibfiles], [
   213    213   					projlibfiles="${projlibfiles}"
   214    214   				])
   215    215   			])
   216    216   
   217    217   			hide_symbols="0"
   218         -			initialize="0"
          218  +			subprojs="`echo " $projlibfilesnostub " | sed 's@ [[^ ]]*/@ @g;s@ lib@@g;s@[[0-9\.]]*\.a@ @g;s@ sqlite @ sqlite3 @;s@ tcl @ @;s@^ *@@;s@ *$@@'`"
   219    219   		fi
   220    220   
   221    221   		if test "${proj}" = "mk4tcl"; then
   222    222   			if test -n "${projlibfiles}"; then
   223    223   				AC_DEFINE(KIT_INCLUDES_MK4TCL, [1], [Specify this if you link against mkt4tcl])
   224    224   
   225    225   				kc_cv_feature_kit_includes_mk4tcl='1'
   226    226   
   227    227   				DC_DO_STATIC_LINK_LIBCXX
   228    228   			fi
   229    229   
   230         -			initialize="0"
          230  +			subprojs=""
   231    231   		fi
   232    232   
   233    233   		if test "${proj}" = "tk"; then
   234    234   			if test "${projlibfilesnostub}" != ""; then
   235    235   				DC_DO_TK
   236    236   				AC_DEFINE(KIT_INCLUDES_TK, [1], [Specify this if we link statically to Tk])
   237    237   				if test -n "${TK_VERSION}"; then
................................................................................
   250    250   						projlibfiles="${projlibfiles}"
   251    251   					])
   252    252   				])
   253    253   
   254    254   				hide_symbols="0"
   255    255   			fi
   256    256   
   257         -			initialize="0"
          257  +			subprojs=""
   258    258   		fi
   259    259   
   260    260   		if test "${proj}" = "tclvfs"; then
   261         -			initialize="0"
          261  +			subprojs=""
   262    262   		fi
   263    263   
   264    264   		if test "${hide_symbols}" = "1"; then
   265    265   			STRIPLIBS="${STRIPLIBS} ${projlibfiles}"
   266    266   		fi
   267    267   
   268    268   		dnl Do not explicitly link to Zlib, that will happen elsewhere
   269    269   		if test "${proj}" = "zlib"; then
   270    270   			continue
   271    271   		fi
   272    272   
   273         -		if test "${initialize}" = "1"; then
          273  +		if test -n "${subprojs}"; then
   274    274   			if test -n "${projlibfilesnostub}"; then
   275         -				projucase="`echo ${proj} | dd conv=ucase 2>/dev/null`"
   276         -				projtcase="`echo ${projucase} | cut -c 1``echo ${proj} | cut -c 2-`"
   277         -				lib_init_func="${projtcase}_Init"
          275  +				for subproj in $subprojs; do
          276  +					subprojucase="`echo ${subproj} | dd conv=ucase 2>/dev/null`"
          277  +					subprojtcase="`echo ${subprojucase} | cut -c 1``echo ${subproj} | cut -c 2-`"
          278  +					lib_init_func="${subprojtcase}_Init"
   278    279   
   279         -				echo "#define KIT_INCLUDES_${projucase}" >> kitInit-libs.h
   280         -				echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
          280  +					echo "#define KIT_INCLUDES_${subprojucase}" >> kitInit-libs.h
          281  +					echo "Tcl_AppInitProc ${lib_init_func};" >> kitInit-libs.h
   281    282   
   282         -				libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
          283  +					libs_init_funcs="${libs_init_funcs} ${lib_init_func}"
          284  +				done
   283    285   			fi
   284    286   		fi
   285    287   
   286    288   		ARCHS="${ARCHS} ${projlibfiles}"
   287    289   		LIBS="${LIBS} ${projlibextra}"
   288    290   	done
   289    291