Partial /bin/sh building

Author: mszoek

BSD/CMakeLists.txt

@@ -23,4 +23,4 @@ add_custom_target(BSD)
 add_dependencies(BSD Darwin)
 
 add_subdirectory(lib)
-#add_subdirectory(bin)
+add_subdirectory(bin)

BSD/bin/sh/CMakeLists.txt

@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 4.0)
 
-add_executable(sh 
+add_executable(sh)
+set(sh_src
+	bltin/echo.c
 	alias.c
 	arith_yacc.c
 	arith_yylex.c
-	builtins.c
 	cd.c
 	error.c
 	eval.c
@@ -17,8 +18,6 @@ add_executable(sh
 	main.c
 	memalloc.c
 	miscbltin.c
-	mknodes.c
-	mksyntax.c
 	mystring.c
 	options.c
 	output.c
@@ -28,9 +27,12 @@ add_executable(sh
 	trap.c
 	var.c)
 target_sources(sh PRIVATE
+	${sh_src}
+	${CMAKE_CURRENT_BINARY_DIR}/builtins.c 
 	${CMAKE_CURRENT_BINARY_DIR}/nodes.c 
 	${CMAKE_CURRENT_BINARY_DIR}/syntax.c)
 target_sources(sh PRIVATE
+	${CMAKE_CURRENT_BINARY_DIR}/builtins.h
 	${CMAKE_CURRENT_BINARY_DIR}/nodes.h
 	${CMAKE_CURRENT_BINARY_DIR}/syntax.h
 	${CMAKE_CURRENT_BINARY_DIR}/token.h)
@@ -46,6 +48,10 @@ target_include_directories(sh PRIVATE
 	${CMAKE_CURRENT_BINARY_DIR}
 	../../lib/libedit/src)
 
+add_custom_command(OUTPUT builtins.c builtins.h
+	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mkbuiltins ${CMAKE_CURRENT_SOURCE_DIR}
+	DEPENDS ${sh_src})
+
 add_custom_command(OUTPUT syntax.c syntax.h
 	COMMAND ${CMAKE_CURRENT_BINARY_DIR}/mksyntax
 	DEPENDS mksyntax)
@@ -74,7 +80,8 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/token.h
 	COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/mktokens)
 
 target_link_options(sh PRIVATE
-	-mmacos-version-min=${MACOS_VERSION_MIN})
+	-mmacos-version-min=${MACOS_VERSION_MIN}
+	-L${ROOT_BINARY_DIR}/BSD/lib/ncurses -lncurses)
 
 target_link_libraries(sh PRIVATE
 	${ROOT_BINARY_DIR}/BSD/lib/libedit/libedit.a)

BSD/bin/sh/builtins.def

@@ -69,16 +69,16 @@ hashcmd		hash
 histcmd		fc
 jobidcmd -n	jobid
 jobscmd -n	jobs
-killcmd -n	kill
+#killcmd -n	kill
 localcmd	local
-printfcmd -n	printf
+#printfcmd -n	printf
 pwdcmd -n	pwd
 readcmd		read
 returncmd	-s return
 setcmd		-s set
 setvarcmd	setvar
 shiftcmd	-s shift
-testcmd -n	test [
+#testcmd -n	test [
 timescmd -n	-s times
 trapcmd		-s trap
 truecmd -n	-s : true