Artifact Content

Artifact 5ecd898e012833d3ae6e27fc822ab2ca99cf1414:

Attachment "kitcreator-0.11.0.diff" to ticket [55f484c18c] added by anonymous on 2019-02-26 05:16:52.
diff -Ncr kitcreator-0.11.0/kitsh/buildsrc/kitsh-0.0/aclocal.m4 kitcreator-0.11.0-local/kitsh/buildsrc/kitsh-0.0/aclocal.m4
*** kitcreator-0.11.0/kitsh/buildsrc/kitsh-0.0/aclocal.m4	2018-06-04 02:40:33.000000000 +0900
--- kitcreator-0.11.0-local/kitsh/buildsrc/kitsh-0.0/aclocal.m4	2019-02-26 11:54:30.291248000 +0900
***************
*** 310,316 ****
  					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
--- 310,316 ----
  					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},${proj}"
  				done
  			fi
  		fi
***************
*** 321,328 ****
  
  	echo '' >> kitInit-libs.h
  	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
! 	for lib_init_func in ${libs_init_funcs}; do
! 		proj="`echo ${lib_init_func} | sed 's@_Init$$@@@' | dd conv=lcase 2>/dev/null`"
  		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
  	done
  	echo '	return;' >> kitInit-libs.h
--- 321,332 ----
  
  	echo '' >> kitInit-libs.h
  	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
! 	for lib_init_func_proj in ${libs_init_funcs}; do
! 		lib_init_func="${lib_init_func_proj%,*}"
! 		proj="${lib_init_func_proj#*,}"
! 		if test "${proj}" = "tcl"; then
! 			proj="`echo ${lib_init_func} | sed 's@_Init$@@' | dd conv=lcase 2>/dev/null`"
! 		fi
  		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
  	done
  	echo '	return;' >> kitInit-libs.h
diff -Ncr kitcreator-0.11.0/kitsh/buildsrc/kitsh-0.0/configure kitcreator-0.11.0-local/kitsh/buildsrc/kitsh-0.0/configure
*** kitcreator-0.11.0/kitsh/buildsrc/kitsh-0.0/configure	2018-06-04 02:40:40.000000000 +0900
--- kitcreator-0.11.0-local/kitsh/buildsrc/kitsh-0.0/configure	2019-02-26 11:55:13.382691100 +0900
***************
*** 5262,5268 ****
  					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
--- 5262,5268 ----
  					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},${proj}"
  				done
  			fi
  		fi
***************
*** 5273,5280 ****
  
  	echo '' >> kitInit-libs.h
  	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
! 	for lib_init_func in ${libs_init_funcs}; do
! 		proj="`echo ${lib_init_func} | sed 's@_Init$@@' | dd conv=lcase 2>/dev/null`"
  		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
  	done
  	echo '	return;' >> kitInit-libs.h
--- 5273,5284 ----
  
  	echo '' >> kitInit-libs.h
  	echo 'static void _Tclkit_GenericLib_Init(void) {' >> kitInit-libs.h
! 	for lib_init_func_proj in ${libs_init_funcs}; do
! 		lib_init_func="${lib_init_func_proj%,*}"
! 		proj="${lib_init_func_proj#*,}"
! 		if test "${proj}" = "tcl"; then
! 			proj="`echo ${lib_init_func} | sed 's@_Init$@@' | dd conv=lcase 2>/dev/null`"
! 		fi
  		echo "	Tcl_StaticPackage(0, \"${proj}\", ${lib_init_func}, NULL);" >> kitInit-libs.h
  	done
  	echo '	return;' >> kitInit-libs.h