Browse Source

buildfile cleanups

sys/src/**.json: use the "Install" key instead of mv in "Post", where
equivalent

sys/src/9/k10/k8cpu.json: move Systab key to proper spot

Change-Id: Ie96a36b5c8ace3f05497e2ce21b5c4b2a9de6e9f
Signed-off-by: Hank Donnay <hdonnay@gmail.com>
Hank Donnay 8 years ago
parent
commit
f25f46ebdb

+ 1 - 1
sys/src/9/k10/k8cpu.json

@@ -71,13 +71,13 @@
 				"Sd": [
 					"sdiahci"
 				],
-				"Systab": "/sys/src/libc/9syscall/sys.h",
 				"Uart": [
 					"i8250",
 					"pci"
 				],
 				"VGA": []
 			},
+			"Systab": "/sys/src/libc/9syscall/sys.h",
 			"Ramfiles": {
 				"bind": "/amd64/bin/bind",
 				"boot": "/sys/src/9/boot/bootk8cpu.elf.out",

+ 2 - 1
sys/src/all.json

@@ -5,7 +5,8 @@
 			"libs.json",
 			"cmd/kcmds.json",
 			"cmd/cmds.json",
-			"9/k10/k8cpu.json"
+			"9/k10/k8cpu.json",
+			"regress/regress.json"
 		]
 	}
 }

+ 1 - 3
sys/src/cmd/9660srv/9660srv.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv 9660srv $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin/",
 		"Program": "9660srv",
 		"SourceFiles": [
 			"9660srv.c",

+ 1 - 4
sys/src/cmd/9nfs/9nfs.json

@@ -3,10 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-			"mv nfsserver $HARVEY/amd64/bin/aux/"
-		],
+		"Install": "/$ARCH/bin/aux",
 		"Program": "nfsserver",
 		"Projects": [
 			"portmapper.json",

+ 1 - 4
sys/src/cmd/9nfs/pcnfsd.json

@@ -3,10 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-			"mv pcnfsd $HARVEY/amd64/bin/aux/"
-		],
+		"Install": "/$ARCH/bin/aux",
 		"Program": "pcnfsd",
 		"SourceFiles": [
 			"pcnfsd.c",

+ 1 - 4
sys/src/cmd/9nfs/portmapper.json

@@ -3,10 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-			"mv portmapper $HARVEY/amd64/bin/aux/"
-		],
+		"Install": "/$ARCH/bin/aux",
 		"Program": "portmapper",
 		"SourceFiles": [
 			"portmapper.c",

+ 1 - 3
sys/src/cmd/astro/astro.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv astro $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "astro",
 		"SourceFiles": [
 			"comet.c",

+ 1 - 2
sys/src/cmd/bzip2/bzip2.json

@@ -9,9 +9,8 @@
 		"Libs": [
 			"lib/libbzip2.a"
 		],
+		"Install": "/$ARCH/bin",
 		"Post": [
-			"mv bunzip2 $HARVEY/amd64/bin/",
-			"mv bzip2 $HARVEY/amd64/bin/",
 			"rm $HARVEY/sys/src/cmd/bzip2/lib/libbzip2.a"
 		],
 		"Projects": [

+ 1 - 3
sys/src/cmd/cb/cb.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv cb $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "cb",
 		"SourceFiles": [
 			"cb.c",

+ 1 - 3
sys/src/cmd/cdfs/cdfs.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv cdfs $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "cdfs",
 		"SourceFiles": [
 			"buf.c",

+ 1 - 3
sys/src/cmd/cifs/cifs.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv cifs $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "cifs",
 		"SourceFiles": [
 			"main.c",

+ 1 - 6
sys/src/cmd/con/con.json

@@ -3,12 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv con $HARVEY/amd64/bin/",
-			"mv xms $HARVEY/amd64/bin/",
-			"mv xmr $HARVEY/amd64/bin/",
-			"mv hayes $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"SourceFilesCmd": [
 			"con.c",
 			"xms.c",

+ 1 - 6
sys/src/cmd/dial/dial.json

@@ -3,12 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv at $HARVEY/amd64/bin/",
-			"mv drain $HARVEY/amd64/bin/",
-			"mv expect $HARVEY/amd64/bin/",
-			"mv pass $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"SourceFilesCmd": [
 			"at.c",
 			"drain.c",

+ 1 - 3
sys/src/cmd/diff/diff.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv diff $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "diff",
 		"SourceFiles": [
 			"diffdir.c",

+ 1 - 1
sys/src/cmd/disk/9660/9660.json

@@ -4,9 +4,9 @@
 			"../../cmd.json"
 		],
 		"Post": [
-			"mv dump9660 $HARVEY/amd64/bin/",
 			"cp mk9660.rc $HARVEY/amd64/bin/mk9660"
 		],
+		"Install": "/$ARCH/bin",
 		"Program": "dump9660",
 		"SourceFiles": [
 			"boot.c",

+ 1 - 3
sys/src/cmd/dossrv/dossrv.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv dossrv $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "dossrv",
 		"SourceFiles": [
 			"xfssrv.c",

+ 1 - 3
sys/src/cmd/exportfs/exportfs.json

@@ -3,9 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
-		"Post": [
-			"mv exportfs $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Program": "exportfs",
 		"SourceFiles": [
 			"exportfs.c",

+ 1 - 9
sys/src/cmd/kcmds.json

@@ -3,15 +3,7 @@
 		"Include": [
 			"kernel.json"
 		],
-		"Post": [
-			"[ -d $HARVEY/amd64/bin ] || mkdir $HARVEY/amd64/bin",
-			"mv bind $HARVEY/amd64/bin/",
-			"mv mount $HARVEY/amd64/bin/",
-			"mv date $HARVEY/amd64/bin/",
-			"mv srv $HARVEY/amd64/bin/",
-			"mv echo $HARVEY/amd64/bin/",
-			"mv ls $HARVEY/amd64/bin/"
-		],
+		"Install": "/$ARCH/bin",
 		"Projects": [
 			"/sys/src/cmd/rc/rc.json",
 			"/sys/src/cmd/ip/ipconfig/kipconfig.json"

+ 1 - 1
sys/src/cmd/rc/rc.json

@@ -4,13 +4,13 @@
 			"../kernel.json"
 		],
 		"Post": [
-			"mv rc $HARVEY/amd64/bin/",
 			"rm y.tab* x.tab*"
 		],
 		"Pre": [
 			"yacc -d syn.y",
 			"cp y.tab.h x.tab.h"
 		],
+		"Install": "/$ARCH/bin",
 		"Program": "rc",
 		"SourceFiles": [
 			"code.c",

+ 1 - 1
sys/src/cmd/syscall/syscall.json

@@ -8,12 +8,12 @@
 			"../cmd.json"
 		],
 		"Post": [
-			"mv syscall $HARVEY/$ARCH/bin/",
 			"rm tab.h"
 		],
 		"Pre": [
 			"cat $HARVEY/sys/src/libc/9syscall/sys.h|grep -v automatically|grep -v -e '^$'|sed '/#define._X[0-9_]/d;/#define.NSYSCALL/d;'|cut -f 2 -d ' '|xargs -n1 sh -c 'echo \\\"$0\\\", \"(int(*)())\" $0,'|tr A-Z a-z \u003e tab.h"
 		],
+		"Install": "/$ARCH/bin",
 		"Program": "syscall",
 		"SourceFiles": [
 			"syscall.c"

+ 1 - 3
sys/src/lib.json

@@ -1,7 +1,7 @@
 {
 	"Libs": {
 		"Include": [
-			"/amd64/include/cflags.json"
+			"/$ARCH/include/cflags.json"
 		],
 		"Oflags": [
 			"-static"
@@ -10,8 +10,6 @@
 			"rm *.o"
 		],
 		"Pre": [
-			"mkdir -p $HARVEY/amd64/bin",
-			"mkdir -p $HARVEY/amd64/lib",
 			"rm -f *.o *.tag.*"
 		]
 	}