Browse Source

Arghf, stupid Sublime...

Elbing Miss 8 years ago
parent
commit
69e6b42dcb
2 changed files with 21 additions and 25 deletions
  1. 11 1
      BUILD
  2. 10 24
      sys/src/9/k10/k8cpu.json

+ 11 - 1
BUILD

@@ -692,7 +692,17 @@ build_a_cmd()
 #   $1 -> cmd name
 clean_a_cmd()
 {
-	cd ${CMD_DIR}/$1
+	if [ -d "${CMD_DIR}/$1" ]
+	then
+		cd ${CMD_DIR}/$1
+	else
+		if [ $1 = ipconfig ]
+		then
+			cd ${CMD_DIR}/ip/$1
+		else
+		cd ${CMD_DIR}
+		fi
+	fi
 	DO_NOTHING=0
 	cmd_${1} 2
 	if [ $DO_NOTHING -eq 0 ]

+ 10 - 24
sys/src/9/k10/k8cpu.json

@@ -4,6 +4,13 @@
     "Include":["core.json", "../386/386.json", "../ip/ip.json", "../port/port.json"], 
 	"Projects": [
 	"/sys/src/cmd/rc/kernel.json",
+	"/sys/src/cmd/ip/ipconfig/kernel.json",
+	"/sys/src/cmd/bind.json",
+	"/sys/src/cmd/mount.json",
+	"/sys/src/cmd/date.json",
+	"/sys/src/cmd/srv.json",
+	"/sys/src/cmd/echo.json",
+	"/sys/src/cmd/ls.json"
 	"/sys/src/cmd/ip/ipconfig/kernel.json"
 	],
     "Pre": [
@@ -21,39 +28,18 @@
 	"cp ../../cmd/echo.elf.out echo.elf.out",
 	"strip echo.elf.out",
 	"data2c _amd64_bin_echo echo.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/cat.elf.out cat.elf.out",
-	"strip cat.elf.out",
-	"data2c _amd64_bin_cat cat.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/cp.elf.out cp.elf.out",
-	"strip cp.elf.out",
-	"data2c _amd64_bin_cp cp.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ls.elf.out ls.elf.out",
-	"strip ls.elf.out",
-	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/ip/ipconfig/ipconfig.elf.out ipconfig.elf.out",
 	"strip ipconfig.elf.out",
 	"data2c _amd64_bin_ipconfig ipconfig.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ip/ping.elf.out ping.elf.out",
-	"strip ping.elf.out",
-	"data2c _amd64_bin_ping ping.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/srv.elf.out srv.elf.out",
 	"strip srv.elf.out",
 	"data2c _amd64_bin_srv srv.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ps.elf.out ps.elf.out",
-	"strip ps.elf.out",
-	"data2c _amd64_bin_ps ps.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/mkdir.elf.out mkdir.elf.out",
-	"strip mkdir.elf.out",
-	"data2c _amd64_bin_mkdir mkdir.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/pwd.elf.out pwd.elf.out",
-	"strip pwd.elf.out",
-	"data2c _amd64_bin_pwd pwd.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/chmod.elf.out chmod.elf.out",
-	"strip chmod.elf.out",
-	"data2c _amd64_bin_chmod chmod.elf.out>> k8cpu.root.c",
 	"cp ../../cmd/date.elf.out date.elf.out",
 	"strip date.elf.out",
 	"data2c _amd64_bin_date date.elf.out>> k8cpu.root.c"
+	"cp ../../cmd/ls.elf.out ls.elf.out",
+	"strip ls.elf.out",
+	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c"
     ],
     "SourceFiles":[
 	"cga.c",