Browse Source

JSON: run preen on json files

Long overdue:
./util/preen -d=false `find . -name "*.json" -print`

Preen needs some cleanup. I never changed it since for a while util/build
was going away. But it still works.

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 2 years ago
parent
commit
702d278ca9
52 changed files with 673 additions and 600 deletions
  1. 3 3
      amd64/include/cflags.json
  2. 3 3
      amd64/include/klib.json
  3. 1 2
      amd64/include/x86_64-elf-gcc.json
  4. 1 2
      amd64/include/x86_64-none-elf-gcc.json
  5. 7 6
      clean.json
  6. 2 1
      riscv/include/cflags.json
  7. 17 15
      sys/src/9/aarch64/core.json
  8. 2 2
      sys/src/9/aarch64/cpu.json
  9. 1 1
      sys/src/9/amd64/amd64coreboot.json
  10. 8 8
      sys/src/9/amd64/build.json
  11. 12 8
      sys/src/9/amd64/core.json
  12. 1 1
      sys/src/9/port/port.json
  13. 20 20
      sys/src/9/riscv/build.json
  14. 11 8
      sys/src/9/riscv/core.json
  15. 6 7
      sys/src/cmd/acme/build.json
  16. 5 5
      sys/src/cmd/acpi/build.json
  17. 6 6
      sys/src/cmd/acpica/acpiexec/build.json
  18. 6 7
      sys/src/cmd/aux/aux.json
  19. 1 2
      sys/src/cmd/aux/gps/gps.json
  20. 2 1
      sys/src/cmd/aux/realemu/loadcom.json
  21. 2 1
      sys/src/cmd/aux/realemu/realemu.json
  22. 2 1
      sys/src/cmd/aux/vga/vga.json
  23. 5 6
      sys/src/cmd/build.json
  24. 1 1
      sys/src/cmd/bzip2/bzip2.json
  25. 1 1
      sys/src/cmd/disk/9660/9660.json
  26. 1 1
      sys/src/cmd/faces/build.json
  27. 12 12
      sys/src/cmd/gdbserver/build.json
  28. 4 5
      sys/src/cmd/ip/snoopy/build.json
  29. 1 2
      sys/src/cmd/ndb/dns.json
  30. 1 2
      sys/src/cmd/ndb/dnsdebug.json
  31. 1 2
      sys/src/cmd/ndb/dnstcp.json
  32. 2 2
      sys/src/cmd/plumb/build.json
  33. 1 1
      sys/src/cmd/plumb/plumb.json
  34. 4 4
      sys/src/cmd/plumb/plumber.json
  35. 2 3
      sys/src/cmd/proof/build.json
  36. 1 1
      sys/src/cmd/rc/rc.json
  37. 2 3
      sys/src/cmd/sam/build.json
  38. 1 1
      sys/src/cmd/samterm/build.json
  39. 8 12
      sys/src/cmd/usb/usbd/build.json
  40. 91 17
      sys/src/cmd/usb/usbd/usbdb.json
  41. 7 8
      sys/src/cmd/zenith/build.json
  42. 25 23
      sys/src/libacpi/acpica/acpiflags.json
  43. 13 14
      sys/src/libacpi/build.json
  44. 13 13
      sys/src/libc/aarch64/build.json
  45. 14 14
      sys/src/libc/amd64/build.json
  46. 245 245
      sys/src/libc/libc.json
  47. 12 12
      sys/src/libc/riscv/build.json
  48. 13 12
      sys/src/libfreetype/libfreetype.json
  49. 2 1
      sys/src/libmach/libmach.json
  50. 7 8
      sys/src/libusb/build.json
  51. 3 3
      sys/src/regress/fs/build.json
  52. 61 61
      sys/src/sysconf.json

+ 3 - 3
amd64/include/cflags.json

@@ -1,8 +1,5 @@
 {
 	"buildflags": {
-		"Include": [
-			"/$ARCH/include/$CC.json"
-		],
 		"Cflags": [
 			"-ffreestanding",
 			"-fno-builtin",
@@ -16,6 +13,9 @@
 			"-static",
 			"-Wall",
 			"-Werror"
+		],
+		"Include": [
+			"/$ARCH/include/$CC.json"
 		]
 	}
 }

+ 3 - 3
amd64/include/klib.json

@@ -1,8 +1,5 @@
 {
 	"KernelLibs": {
-		"Include": [
-			"/$ARCH/include/$CC.json"
-		],
 		"Cflags": [
 			"-mcmodel=kernel",
 			"-O0",
@@ -13,6 +10,9 @@
 			"-Werror",
 			"-g"
 		],
+		"Include": [
+			"/$ARCH/include/$CC.json"
+		],
 		"Oflags": [
 			"-static"
 		],

+ 1 - 2
amd64/include/x86_64-elf-gcc.json

@@ -1,6 +1,5 @@
 {
 	"buildflags": {
-		"Cflags": [
-		]
+		"Cflags": []
 	}
 }

+ 1 - 2
amd64/include/x86_64-none-elf-gcc.json

@@ -1,6 +1,5 @@
 {
 	"buildflags": {
-		"Cflags": [
-		]
+		"Cflags": []
 	}
 }

+ 7 - 6
clean.json

@@ -1,10 +1,11 @@
 {
 	"amd64cpu": {
-		"Projects": ["/sys/src/9/amd64/clean.json"],
-	"Pre": [
-		"rm -f -rf $ARCH/lib/*.a $ARCH/bin/*",
-		"git checkout $ARCH/bin"
-	]
+		"Pre": [
+			"rm -f -rf $ARCH/lib/*.a $ARCH/bin/*",
+			"git checkout $ARCH/bin"
+		],
+		"Projects": [
+			"/sys/src/9/amd64/clean.json"
+		]
 	}
-	
 }

+ 2 - 1
riscv/include/cflags.json

@@ -14,7 +14,8 @@
 			"-Werror"
 		],
 		"Oflags": [
-			"-T","/$ARCH/include/prog.ld",
+			"-T",
+			"/$ARCH/include/prog.ld",
 			"--no-relax"
 		]
 	}

+ 17 - 15
sys/src/9/aarch64/core.json

@@ -9,8 +9,23 @@
 			"-g",
 			"-Wall",
 			"-Werror",
-			"-I", "/sys/src/9/aarch64",
-			"-I", "/sys/src/9/port"
+			"-I",
+			"/sys/src/9/aarch64",
+			"-I",
+			"/sys/src/9/port"
+		],
+		"MissingSourceFiles": [
+			"arch.c",
+			"asm.c",
+			"devarch.c",
+			"map.c",
+			"memory.c",
+			"mmu.c",
+			"mp.c",
+			"physalloc.c",
+			"systab.c",
+			"tcore.c",
+			"trap.c"
 		],
 		"NoLibs": [
 			"/$ARCH/lib/klibc.a"
@@ -32,19 +47,6 @@
 			"../boot/bootconf.json",
 			"inith.json"
 		],
-	    "MissingSourceFiles": [
-			"arch.c",
-			"asm.c",
-			"devarch.c",
-			"map.c",
-			"memory.c",
-			"mmu.c",
-			"mp.c",
-			"physalloc.c",
-			"systab.c",
-			"tcore.c",
-			"trap.c"
-		],
 		"SourceFiles": [
 			"main.c"
 		]

+ 2 - 2
sys/src/9/aarch64/cpu.json

@@ -57,14 +57,14 @@
 				"cat": "/$ARCH/bin/cat",
 				"date": "/$ARCH/bin/date",
 				"echo": "/$ARCH/bin/echo",
+				"ed": "/$ARCH/bin/ed",
 				"factotum": "/$ARCH/bin/auth/factotum",
 				"ipconfig": "/$ARCH/bin/ip/ipconfig",
 				"ls": "/$ARCH/bin/ls",
 				"mount": "/$ARCH/bin/mount",
 				"nvram": "/util/nvram",
-				"rc": "/$ARCH/bin/rc",
 				"ps": "/$ARCH/bin/ps",
-				"ed": "/$ARCH/bin/ed",
+				"rc": "/$ARCH/bin/rc",
 				"rcmain": "/rc/lib/rcmain",
 				"screenconsole": "/$ARCH/bin/aux/screenconsole",
 				"srv": "/$ARCH/bin/srv"

+ 1 - 1
sys/src/9/amd64/amd64coreboot.json

@@ -116,7 +116,7 @@
 			"usbehcipc.c",
 			"usbohci.c",
 			"usbuhci.c",
-		    "cbvga.c"
+			"cbvga.c"
 		]
 	}
 }

+ 8 - 8
sys/src/9/amd64/build.json

@@ -89,32 +89,32 @@
 				"bind": "/$ARCH/bin/bind",
 				"boot": "/sys/src/9/boot/bootcpu.elf.out",
 				"cat": "/$ARCH/bin/cat",
+				"crs": "/$ARCH/bin/acpi/crs",
 				"date": "/$ARCH/bin/date",
 				"echo": "/$ARCH/bin/echo",
+				"ed": "/$ARCH/bin/ed",
 				"factotum": "/$ARCH/bin/auth/factotum",
 				"fdisk": "/$ARCH/bin/disk/fdisk",
 				"fossil": "/$ARCH/bin/fossil/fossil",
 				"grep": "/$ARCH/bin/grep",
 				"ipconfig": "/$ARCH/bin/ip/ipconfig",
-				"crs": "/$ARCH/bin/acpi/crs",
 				"irq": "/$ARCH/bin/acpi/irq",
 				"ls": "/$ARCH/bin/ls",
 				"mount": "/$ARCH/bin/mount",
 				"nvram": "/util/nvram",
-				"prep": "/$ARCH/bin/disk/prep",
-				"rc": "/$ARCH/bin/rc",
 				"pci": "/rc/bin/pci",
+				"prep": "/$ARCH/bin/disk/prep",
 				"ps": "/$ARCH/bin/ps",
-				"ed": "/$ARCH/bin/ed",
-				"rcmain": "/rc/lib/rcmain",
 				"ratrace": "/$ARCH/bin/ratrace",
-				"sed": "/$ARCH/bin/sed",
+				"rc": "/$ARCH/bin/rc",
+				"rcmain": "/rc/lib/rcmain",
 				"realemu": "/$ARCH/bin/aux/realemu",
-				"vga": "/$ARCH/bin/aux/vga",
+				"sed": "/$ARCH/bin/sed",
 				"srv": "/$ARCH/bin/srv",
 				"startdisk": "startdisk",
 				"usbd": "/$ARCH/bin/usb/usbd",
-				"venti": "/$ARCH/bin/venti/venti"
+				"venti": "/$ARCH/bin/venti/venti",
+				"vga": "/$ARCH/bin/aux/vga"
 			},
 			"Systab": "/sys/src/libc/9syscall/sys.h"
 		},

+ 12 - 8
sys/src/9/amd64/core.json

@@ -1,8 +1,5 @@
 {
 	"core": {
-		"Include": [
-			"/$ARCH/include/$CC.json"
-		],
 		"Cflags": [
 			"-mcmodel=kernel",
 			"-O0",
@@ -15,10 +12,17 @@
 			"-Wall",
 			"-Werror",
 			"-D__HARVEY__",
-			"-U_LINUX", "-U__linux__",
-			"-I", "/sys/src/9/amd64",
-			"-I", "/sys/src/9/port",
-			"-I", "/sys/src/libc/9syscall"
+			"-U_LINUX",
+			"-U__linux__",
+			"-I",
+			"/sys/src/9/amd64",
+			"-I",
+			"/sys/src/9/port",
+			"-I",
+			"/sys/src/libc/9syscall"
+		],
+		"Include": [
+			"/$ARCH/include/$CC.json"
 		],
 		"Libs": [
 			"/$ARCH/lib/klibmemlayer.a",
@@ -67,7 +71,7 @@
 			"backtrace.c",
 			"../port/dev9p.c",
 			"../port/devbridge.c",
-		        "coreboot.c",
+			"coreboot.c",
 			"ctype.c",
 			"devarch.c",
 			"../port/devdraw.c",

+ 1 - 1
sys/src/9/port/port.json

@@ -51,7 +51,7 @@
 			"../port/hexdump.c",
 			"../port/image.c",
 			"../port/kdebug.c",
-		        "../port/ipchecksum.c",
+			"../port/ipchecksum.c",
 			"../port/latin1.c",
 			"../port/mul64fract.c",
 			"../port/netif.c",

+ 20 - 20
sys/src/9/riscv/build.json

@@ -12,22 +12,31 @@
 			"../port/port.json"
 		],
 		"Kernel": {
+			"#RamFiles": {
+				"boot": "/$ARCH/bin/kiss",
+				"cat": "/$ARCH/bin/cat",
+				"cow": "/$ARCH/bin/regress/cow",
+				"empty": "/$ARCH/bin/regress/empty",
+				"factotum": "/$ARCH/bin/auth/factotum",
+				"getcallerpc": "/$ARCH/bin/regress/getcallerpc",
+				"ipconfig": "/$ARCH/bin/ip/ipconfig",
+				"longjmp": "/$ARCH/bin/regress/longjmp",
+				"pipering": "/$ARCH/bin/regress/pipering",
+				"privates": "/$ARCH/bin/regress/privates",
+				"ratrace": "/$ARCH/bin/ratrace"
+			},
 			"Config": {
 				"Code": [
 					"int cpuserver = 1;",
 					"uint32_t kerndate = 1;"
 				],
-				"NoDev": [
-					"kbin",
-					"kprof"
-				],
 				"Dev": [
 					"arch",
 					"cap",
 					"cons",
 					"dup",
 					"env",
-				        "ip",
+					"ip",
 					"mnt",
 					"mntn",
 					"pipe",
@@ -52,34 +61,25 @@
 					"loopbackmedium",
 					"netdevmedium"
 				],
+				"NoDev": [
+					"kbin",
+					"kprof"
+				],
 				"NoUart": [
 					"pci"
 				]
 			},
-		        "#RamFiles": {
-				"ipconfig": "/$ARCH/bin/ip/ipconfig",
-				"longjmp": "/$ARCH/bin/regress/longjmp",
-				"empty": "/$ARCH/bin/regress/empty",
-				"factotum": "/$ARCH/bin/auth/factotum",
-				"getcallerpc": "/$ARCH/bin/regress/getcallerpc",
-				"pipering": "/$ARCH/bin/regress/pipering",
-				"privates": "/$ARCH/bin/regress/privates",
-				"ratrace": "/$ARCH/bin/ratrace",
-				"cat": "/$ARCH/bin/cat",
-				"cow": "/$ARCH/bin/regress/cow",
-				"boot" : "/$ARCH/bin/kiss"
-			    },
 			"Ramfiles": {
 				"bind": "/$ARCH/bin/bind",
 				"boot": "/sys/src/9/boot/bootcpu.elf.out",
 				"date": "/$ARCH/bin/date",
 				"echo": "/$ARCH/bin/echo",
+				"ed": "/$ARCH/bin/ed",
 				"ls": "/$ARCH/bin/ls",
 				"mount": "/$ARCH/bin/mount",
 				"nvram": "/util/nvram",
-				"rc": "/$ARCH/bin/rc",
 				"ps": "/$ARCH/bin/ps",
-				"ed": "/$ARCH/bin/ed",
+				"rc": "/$ARCH/bin/rc",
 				"rcmain": "/rc/lib/rcmain",
 				"srv": "/$ARCH/bin/srv"
 			},

+ 11 - 8
sys/src/9/riscv/core.json

@@ -10,13 +10,16 @@
 			"-g",
 			"-Wall",
 			"-Werror",
-			"-I", "/sys/src/9/riscv",
-			"-I", "/sys/src/9/port",
-			"-I", "/sys/src/libc/9syscall"
+			"-I",
+			"/sys/src/9/riscv",
+			"-I",
+			"/sys/src/9/port",
+			"-I",
+			"/sys/src/libc/9syscall"
 		],
 		"Libs": [
 			"/$ARCH/lib/klibc.a",
-                        "/$ARCH/lib/klibip.a",
+			"/$ARCH/lib/klibip.a",
 			"/$ARCH/lib/klibsec.a"
 		],
 		"Oflags": [
@@ -42,7 +45,7 @@
 			"arch.c",
 			"archriscv.c",
 			"asm.c",
-		        "acore.c",
+			"acore.c",
 			"backtrace.c",
 			"coreboot.c",
 			"ctype.c",
@@ -57,9 +60,9 @@
 			"_spl.S",
 			"syscall.c",
 			"systab.c",
-		        "tcore.c",
-		        "trap.c",
-		        "trapentry.S",
+			"tcore.c",
+			"trap.c",
+			"trapentry.S",
 			"uart8250mem.c",
 			"uart.c"
 		]

+ 6 - 7
sys/src/cmd/acme/build.json

@@ -1,13 +1,15 @@
 {
 	"acme": {
-		"CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin",
+		"Post": [
+			"mkdir -p /mnt/acme"
+		],
 		"Program": "acme",
-	 	"SourceFiles": [
+		"SourceFiles": [
 			"acme.c",
 			"addr.c",
 			"buff.c",
@@ -28,9 +30,6 @@
 			"util.c",
 			"wind.c",
 			"xfid.c"
-		],
-	        "Post": [
-	                "mkdir -p /mnt/acme"
-	        ]
+		]
 	}
 }

+ 5 - 5
sys/src/cmd/acpi/build.json

@@ -1,17 +1,17 @@
 {
 	"irq": {
-	    "Include": [
+		"Include": [
 			"/sys/src/libacpi/acpica/acpiflags.json",
 			"/sys/src/cmd/cmd.json"
 		],
-		"Oflags": [
-			"-lacpi"
-		],
 		"Install": "/$ARCH/bin/acpi",
-		"Program": "irq",
 		"NSourceFiles": [
 			"alltables.c"
 		],
+		"Oflags": [
+			"-lacpi"
+		],
+		"Program": "irq",
 		"SourceFilesCmd": [
 			"TestACPISleep.c",
 			"crs.c",

+ 6 - 6
sys/src/cmd/acpica/acpiexec/build.json

@@ -1,17 +1,17 @@
 {
 	"aeexec": {
-	    "Include": [
-		"/sys/src/libacpi/acpica/acpiflags.json",
+		"Include": [
+			"/sys/src/libacpi/acpica/acpiflags.json",
 			"/sys/src/cmd/cmd.json"
 		],
+		"Install": "/$ARCH/bin/acpi",
+		"NSourceFiles": [
+			"alltables.c"
+		],
 		"Oflags": [
 			"-lacpi"
 		],
-		"Install": "/$ARCH/bin/acpi",
 		"Program": "aeexec",
-		"NSourceFiles": [
-		    "alltables.c"
-		],
 		"SourceFiles": [
 			"aeexec.c",
 			"aehandlers.c",

+ 6 - 7
sys/src/cmd/aux/aux.json

@@ -1,16 +1,10 @@
 {
 	"Aux": {
-	    "CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin/aux",
-	    "WhoCares": [
-			"mnihongo/mnihongo.json",
-			"gps/gps.json",
-			"flashfs/flashfs.json"
-		],
 		"Projects": [
 			"realemu/realemu.json",
 			"realemu/loadcom.json",
@@ -50,6 +44,11 @@
 			"write.c",
 			"zerotrunc.c",
 			"tty.c"
+		],
+		"WhoCares": [
+			"mnihongo/mnihongo.json",
+			"gps/gps.json",
+			"flashfs/flashfs.json"
 		]
 	}
 }

+ 1 - 2
sys/src/cmd/aux/gps/gps.json

@@ -1,7 +1,6 @@
 {
 	"gpsfs": {
-	    "CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"../../cmd.json"
 		],

+ 2 - 1
sys/src/cmd/aux/realemu/loadcom.json

@@ -1,7 +1,8 @@
 {
 	"Loadcom": {
 		"Cflags": [
-			"-I", "/"
+			"-I",
+			"/"
 		],
 		"Include": [
 			"../../cmd.json"

+ 2 - 1
sys/src/cmd/aux/realemu/realemu.json

@@ -1,7 +1,8 @@
 {
 	"realemu": {
 		"Cflags": [
-			"-I", "/"
+			"-I",
+			"/"
 		],
 		"Include": [
 			"../../cmd.json"

+ 2 - 1
sys/src/cmd/aux/vga/vga.json

@@ -1,7 +1,8 @@
 {
 	"vga": {
 		"Cflags": [
-			"-I", "/"
+			"-I",
+			"/"
 		],
 		"Include": [
 			"../../cmd.json"

+ 5 - 6
sys/src/cmd/build.json

@@ -1,7 +1,6 @@
 {
 	"Cmd": {
-		"CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"cmd.json"
 		],
@@ -15,10 +14,6 @@
 			"cmd.json"
 		],
 		"Install": "/$ARCH/bin/",
-		"WhoCares": [
-			"cdfs/cdfs.json",
-			"cifs/cifs.json"
-		],
 		"Projects": [
 			"9660srv/9660srv.json",
 			"acpi/build.json",
@@ -53,6 +48,10 @@
 			"samterm/build.json",
 			"usb/build.json",
 			"venti/venti.json"
+		],
+		"WhoCares": [
+			"cdfs/cdfs.json",
+			"cifs/cifs.json"
 		]
 	}
 }

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

@@ -6,10 +6,10 @@
 		"Include": [
 			"../cmd.json"
 		],
+		"Install": "/$ARCH/bin",
 		"Libs": [
 			"/sys/src/cmd/bzip2/lib/libbzip2.a"
 		],
-		"Install": "/$ARCH/bin",
 		"Post": [
 			"rm -f $HARVEY/sys/src/cmd/bzip2/lib/libbzip2.a"
 		],

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

@@ -3,10 +3,10 @@
 		"Include": [
 			"../../cmd.json"
 		],
+		"Install": "/$ARCH/bin",
 		"Post": [
 			"cp mk9660.rc /$ARCH/bin/mk9660"
 		],
-		"Install": "/$ARCH/bin",
 		"Program": "dump9660",
 		"SourceFiles": [
 			"boot.c",

+ 1 - 1
sys/src/cmd/faces/build.json

@@ -4,10 +4,10 @@
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin/",
+		"Program": "faces",
 		"Projects": [
 			"dblook.json"
 		],
-		"Program": "faces",
 		"SourceFiles": [
 			"main.c",
 			"facedb.c",

+ 12 - 12
sys/src/cmd/gdbserver/build.json

@@ -1,15 +1,15 @@
 {
-    "gdbserver": {
-	"Include": [
-	    "/sys/src/cmd/cmd.json"
-	],
-	"Install": "/$ARCH/bin",
+	"gdbserver": {
+		"Include": [
+			"/sys/src/cmd/cmd.json"
+		],
+		"Install": "/$ARCH/bin",
 		"Program": "gdbserver",
-	"SourceFiles": [
-	    "$ARCH.S",
-	    "regs$ARCH.c",
-	    "debug_core.c",
-	    "gdbstub.c"
-	]
-    }
+		"SourceFiles": [
+			"$ARCH.S",
+			"regs$ARCH.c",
+			"debug_core.c",
+			"gdbstub.c"
+		]
+	}
 }

+ 4 - 5
sys/src/cmd/ip/snoopy/build.json

@@ -5,12 +5,11 @@
 		],
 		"Install": "/$ARCH/bin/ip",
 		"Pre": [
-		        "yacc --defines filter.y"
+			"yacc --defines filter.y"
 		],
-	    
 		"Program": "snoopy",
-	"SourceFiles": [
-	    "/sys/src/cmd/ndb/convM2DNS.c",
+		"SourceFiles": [
+			"/sys/src/cmd/ndb/convM2DNS.c",
 			"aoeata.c",
 			"aoe.c",
 			"aoecmd.c",
@@ -54,7 +53,7 @@
 			"tcp.c",
 			"ttls.c",
 			"udp.c",
-	                "y.tab.c"
+			"y.tab.c"
 		]
 	}
 }

+ 1 - 2
sys/src/cmd/ndb/dns.json

@@ -1,7 +1,6 @@
 {
 	"dns": {
-	"CFlags": [
-	],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],

+ 1 - 2
sys/src/cmd/ndb/dnsdebug.json

@@ -1,7 +1,6 @@
 {
 	"dnsdebug": {
-	"CFlags": [
-	],
+		"CFlags": [],
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],

+ 1 - 2
sys/src/cmd/ndb/dnstcp.json

@@ -1,7 +1,6 @@
 {
 	"dnstcp": {
-	"CFlags": [
-	],
+		"CFlags": [],
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],

+ 2 - 2
sys/src/cmd/plumb/build.json

@@ -3,11 +3,11 @@
 		"Include": [
 			"../cmd.json"
 		],
+		"Install": "/$ARCH/bin/",
+		"Program": "plumb",
 		"Projects": [
 			"plumber.json"
 		],
-		"Install": "/$ARCH/bin/",
-		"Program": "plumb",
 		"SourceFiles": [
 			"plumb.c"
 		]

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

@@ -6,7 +6,7 @@
 		"Install": "/$ARCH/bin/",
 		"Program": "plumb",
 		"SourceFiles": [
-                        "plumb.c"
+			"plumb.c"
 		]
 	}
 }

+ 4 - 4
sys/src/cmd/plumb/plumber.json

@@ -6,10 +6,10 @@
 		"Install": "/$ARCH/bin/",
 		"Program": "plumber",
 		"SourceFiles": [
-                        "fsys.c",
-                        "match.c",
-                        "plumber.c",
-                        "rules.c"
+			"fsys.c",
+			"match.c",
+			"plumber.c",
+			"rules.c"
 		]
 	}
 }

+ 2 - 3
sys/src/cmd/proof/build.json

@@ -1,13 +1,12 @@
 {
 	"proof": {
-		"CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin/",
 		"Program": "proof",
-	 	"SourceFiles": [
+		"SourceFiles": [
 			"font.c",
 			"htroff.c",
 			"main.c",

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

@@ -3,6 +3,7 @@
 		"Include": [
 			"../cmd.json"
 		],
+		"Install": "/$ARCH/bin",
 		"Post": [
 			"rm -f y.tab* x.tab*"
 		],
@@ -10,7 +11,6 @@
 			"yacc -d syn.y",
 			"cp y.tab.h x.tab.h"
 		],
-		"Install": "/$ARCH/bin",
 		"Program": "rc",
 		"SourceFiles": [
 			"code.c",

+ 2 - 3
sys/src/cmd/sam/build.json

@@ -1,13 +1,12 @@
 {
 	"sam": {
-	"CFlags": [
-	],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin/",
 		"Program": "sam",
-	 	"SourceFiles": [
+		"SourceFiles": [
 			"address.c",
 			"buff.c",
 			"cmd.c",

+ 1 - 1
sys/src/cmd/samterm/build.json

@@ -5,7 +5,7 @@
 		],
 		"Install": "/$ARCH/bin/aux",
 		"Program": "samterm",
-	 	"SourceFiles": [
+		"SourceFiles": [
 			"flayer.c",
 			"icons.c",
 			"io.c",

+ 8 - 12
sys/src/cmd/usb/usbd/build.json

@@ -1,24 +1,20 @@
 {
 	"usbd": {
-		"Cflags": [
-			"-I", 
-			"../lib"
-		],
-	    "Oflags": [
-		"-lusb"
-		],
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
 		"Install": "/$ARCH/bin/usb",
-	    "Pre": [
-		"go run ./m.go -o devtab.c usbdb.json"
+		"Oflags": [
+			"-lusb"
+		],
+		"Pre": [
+			"go run ./m.go -o devtab.c usbdb.json"
 		],
 		"Program": "usbd",
 		"SourceFiles": [
-		    "usbd.c",
-		    "dev.c",
-		    "devtab.c"
+			"usbd.c",
+			"dev.c",
+			"devtab.c"
 		]
 	}
 }

+ 91 - 17
sys/src/cmd/usb/usbd/usbdb.json

@@ -1,20 +1,94 @@
 {
-    "Comment": [
-	"only kb, disk, and ether are prepared for embedding.",
-	"others are not yet converted to sit in the usbd device driver library."
-    ],
-    "Embeds": [
-	{"Name": "kb", "Class": "0", "CSP": ["0x010103", "0x020103", "0", "0"], "VID": "-1", "DID": "-1"},
-	{"Name": "disk", "Class": "8", "CSP": [	"DCL", "0", "0", "0" ], "VID": "-1", "DID": "-1"}
+	"Comment": [
+		"only kb, disk, and ether are prepared for embedding.",
+		"others are not yet converted to sit in the usbd device driver library."
 	],
-    "NotWorkingEmbeds": [
-	{"Name": "ether", "Class": "255", "CSP": ["0x00ffff", "0", "0", "0"], "VID": "0x0b95", "DID": "0"},
-	{"Name": "ether", "Class": "255", "CSP": ["0xff00ff", "0", "0", "0"], "VID": "0x0424", "DID": "0xec00"},
-	{"Name": "serial", "Class": "255", "CSP": ["0xffffff", "0", "0", "0"], "VID": "0x9e88", "DID": "0x9e8f"},
-	{"Name": "serial", "Class": "255", "CSP": ["0xffffff", "0", "0", "0"], "VID": "0x0403", "DID": "0"},
-	{"Name": "serial", "Class": "255", "CSP": ["0x0000ff", "0", "0", "0"], "VID": "0x10c4", "DID": "0"}
-
-    ]
-    
+	"Embeds": [
+		{
+			"CSP": [
+				"0x010103",
+				"0x020103",
+				"0",
+				"0"
+			],
+			"Class": "0",
+			"DID": "-1",
+			"Name": "kb",
+			"VID": "-1"
+		},
+		{
+			"CSP": [
+				"DCL",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "8",
+			"DID": "-1",
+			"Name": "disk",
+			"VID": "-1"
+		}
+	],
+	"NotWorkingEmbeds": [
+		{
+			"CSP": [
+				"0x00ffff",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "255",
+			"DID": "0",
+			"Name": "ether",
+			"VID": "0x0b95"
+		},
+		{
+			"CSP": [
+				"0xff00ff",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "255",
+			"DID": "0xec00",
+			"Name": "ether",
+			"VID": "0x0424"
+		},
+		{
+			"CSP": [
+				"0xffffff",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "255",
+			"DID": "0x9e8f",
+			"Name": "serial",
+			"VID": "0x9e88"
+		},
+		{
+			"CSP": [
+				"0xffffff",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "255",
+			"DID": "0",
+			"Name": "serial",
+			"VID": "0x0403"
+		},
+		{
+			"CSP": [
+				"0x0000ff",
+				"0",
+				"0",
+				"0"
+			],
+			"Class": "255",
+			"DID": "0",
+			"Name": "serial",
+			"VID": "0x10c4"
+		}
+	]
 }
-

+ 7 - 8
sys/src/cmd/zenith/build.json

@@ -1,13 +1,16 @@
 {
 	"zenith": {
-		"CFlags": [
-		],
+		"CFlags": [],
 		"Include": [
 			"../cmd.json"
 		],
 		"Install": "/$ARCH/bin",
+		"Post": [
+			"mkdir -p /mnt/acme",
+			"cp zenith.init /$ARCH/bin"
+		],
 		"Program": "zenith",
-	 	"SourceFiles": [
+		"SourceFiles": [
 			"acme.c",
 			"addr.c",
 			"buff.c",
@@ -28,10 +31,6 @@
 			"util.c",
 			"wind.c",
 			"xfid.c"
-		],
-	        "Post": [
-	                "mkdir -p /mnt/acme",
-			"cp zenith.init /$ARCH/bin"
-	        ]
+		]
 	}
 }

+ 25 - 23
sys/src/libacpi/acpica/acpiflags.json

@@ -1,38 +1,40 @@
 {
 	"acpiflags": {
-		"NoCflags": [
-			"-Werror not used because ACPICA sucks",
-			"-Wconversion"
-		],
 		"Cflags": [
-		        "-DACPI_DEBUGGER",
-		        "-DACPI_DISASSEMBLER",
-		        "-DACPI_EXEC_APP",
-		        "-D__HARVEY__",
-		        "-U_LINUX",
-		        "-U__linux__",
-                        "-U__FreeBSD__",
+			"-DACPI_DEBUGGER",
+			"-DACPI_DISASSEMBLER",
+			"-DACPI_EXEC_APP",
+			"-D__HARVEY__",
+			"-U_LINUX",
+			"-U__linux__",
+			"-U__FreeBSD__",
 			"-Wno-unused-function",
 			"-Wno-unused-variable",
 			"-Wno-unused-const-variable",
 			"-Wno-unknown-pragmas",
-			"-Wall", 
-			"-Werror", 
+			"-Wall",
+			"-Werror",
 			"-nostdlib",
 			"-nostdinc",
-		        "-fno-builtin",
-			"-include", "u.h",
-			"-include", "libc.h",
-			"-include", "ctype.h",
-			"-include", "/$ARCH/include/mach_acpi.h",
-			"-I", "/sys/include/acpi/acpica"
-		],
-		"NoCflags": [
-			"-include", "libc.h",
-			"-Werror"
+			"-fno-builtin",
+			"-include",
+			"u.h",
+			"-include",
+			"libc.h",
+			"-include",
+			"ctype.h",
+			"-include",
+			"/$ARCH/include/mach_acpi.h",
+			"-I",
+			"/sys/include/acpi/acpica"
 		],
 		"IncludeCanNotUsedWUnusedYet": [
 			"../../lib.json"
+		],
+		"NoCflags": [
+			"-include",
+			"libc.h",
+			"-Werror"
 		]
 	}
 }

+ 13 - 14
sys/src/libacpi/build.json

@@ -1,7 +1,7 @@
 {
 	"Libacpi": {
 		"#Projects": [
-		    "acpica/libacpi.json"
+			"acpica/libacpi.json"
 		],
 		"Include": [
 			"/sys/src/libacpi/acpica/acpiflags.json"
@@ -10,19 +10,18 @@
 		"Library": "libacpi.a",
 		"SourceFiles": [
 			"*.c",
-		"/sys/src/libacpi/acpica/components/events/*.c",
-		"/sys/src/libacpi/acpica/components/parser/*.c",
-		"/sys/src/libacpi/acpica/components/utilities/*.c",
-		"/sys/src/libacpi/acpica/components/executer/*.c",
-		"/sys/src/libacpi/acpica/components/namespace/*.c",
-		"/sys/src/libacpi/acpica/components/hardware/*.c",
-		"/sys/src/libacpi/acpica/components/tables/*.c",
-		"/sys/src/libacpi/acpica/components/disassembler/*.c",
-		"/sys/src/libacpi/acpica/components/debugger/*.c",
-		"/sys/src/libacpi/acpica/components/resources/*.c",
-		"/sys/src/libacpi/acpica/components/dispatcher/*.c",
-		"/sys/src/libacpi/acpica/common/*.c"
+			"/sys/src/libacpi/acpica/components/events/*.c",
+			"/sys/src/libacpi/acpica/components/parser/*.c",
+			"/sys/src/libacpi/acpica/components/utilities/*.c",
+			"/sys/src/libacpi/acpica/components/executer/*.c",
+			"/sys/src/libacpi/acpica/components/namespace/*.c",
+			"/sys/src/libacpi/acpica/components/hardware/*.c",
+			"/sys/src/libacpi/acpica/components/tables/*.c",
+			"/sys/src/libacpi/acpica/components/disassembler/*.c",
+			"/sys/src/libacpi/acpica/components/debugger/*.c",
+			"/sys/src/libacpi/acpica/components/resources/*.c",
+			"/sys/src/libacpi/acpica/components/dispatcher/*.c",
+			"/sys/src/libacpi/acpica/common/*.c"
 		]
 	}
 }
-	

+ 13 - 13
sys/src/libc/aarch64/build.json

@@ -1,15 +1,15 @@
 {
-    "archfiles": {
-        "SourceFiles": [
-            "$ARCH/ainc.S",
-            "$ARCH/argv0.c",
-            "$ARCH/getcallerpc.S",
-            "$ARCH/getcallstack.S",
-            "$ARCH/main9.S",
-            "$ARCH/notejmp.c",
-            "$ARCH/setjmp.c",
-            "$ARCH/sqrt.c",
-            "$ARCH/tas.S"
-        ]
-    }
+	"archfiles": {
+		"SourceFiles": [
+			"$ARCH/ainc.S",
+			"$ARCH/argv0.c",
+			"$ARCH/getcallerpc.S",
+			"$ARCH/getcallstack.S",
+			"$ARCH/main9.S",
+			"$ARCH/notejmp.c",
+			"$ARCH/setjmp.c",
+			"$ARCH/sqrt.c",
+			"$ARCH/tas.S"
+		]
+	}
 }

+ 14 - 14
sys/src/libc/amd64/build.json

@@ -1,16 +1,16 @@
 {
-    "archfiles": {
-	"SourceFiles": [
-	    "$ARCH/notejmp.c",
-	    "$ARCH/cycles.c",
-	    "$ARCH/argv0.c",
-	    "port/getcallstack.c",
-	    "$ARCH/rdpmc.c",
-	    "$ARCH/setjmp.s",
-	    "$ARCH/sqrt.s",
-	    "$ARCH/tas.s",
-	    "$ARCH/atom.S",
-	    "$ARCH/main9.S"
-	]
-    }
+	"archfiles": {
+		"SourceFiles": [
+			"$ARCH/notejmp.c",
+			"$ARCH/cycles.c",
+			"$ARCH/argv0.c",
+			"port/getcallstack.c",
+			"$ARCH/rdpmc.c",
+			"$ARCH/setjmp.s",
+			"$ARCH/sqrt.s",
+			"$ARCH/tas.s",
+			"$ARCH/atom.S",
+			"$ARCH/main9.S"
+		]
+	}
 }

+ 245 - 245
sys/src/libc/libc.json

@@ -1,249 +1,249 @@
 {
-"Libc": {
-	"Cflags": [
-		"-fasm"
-	],
-	"Include": [
-		"../lib.json",
-		"$ARCH/build.json"
-	],
-	"Install": "/$ARCH/lib/",
-	"Library": "libc.a",
-	"Projects": [
-		"9syscall/9syscall.json"
-	],
-	"SourceFiles": [
-		"9sys/access.c",
-		"9sys/announce.c",
-		"9sys/convD2M.c",
-		"9sys/convM2D.c",
-		"9sys/convM2S.c",
-		"9sys/convS2M.c",
-		"9sys/cputime.c",
-		"9sys/ctime.c",
-		"9sys/dial.c",
-		"9sys/dirfstat.c",
-		"9sys/dirfwstat.c",
-		"9sys/dirmodefmt.c",
-		"9sys/dirread.c",
-		"9sys/dirstat.c",
-		"9sys/dirwstat.c",
-		"9sys/fcallfmt.c",
-		"9sys/fork.c",
-		"9sys/getnetconninfo.c",
-		"9sys/getenv.c",
-		"9sys/getpid.c",
-		"9sys/getppid.c",
-		"9sys/getwd.c",
-		"9sys/iounit.c",
-		"9sys/nulldir.c",
-		"9sys/postnote.c",
-		"9sys/privalloc.c",
-		"9sys/pushssl.c",
-		"9sys/pushtls.c",
-		"9sys/putenv.c",
-		"9sys/qlock.c",
-		"9sys/read9pmsg.c",
-		"9sys/read.c",
-		"9sys/readv.c",
-		"9sys/rerrstr.c",
-		"9sys/sbrk.c",
-		"9sys/setnetmtpt.c",
-		"9sys/sysfatal.c",
-		"9sys/syslog.c",
-		"9sys/sysname.c",
-		"9sys/time.c",
-		"9sys/times.c",
-		"9sys/tm2sec.c",
-		"9sys/truerand.c",
-		"9sys/wait.c",
-		"9sys/waitpid.c",
-		"9sys/werrstr.c",
-		"9sys/write.c",
-		"9sys/writev.c",
-		"9syscall/alarm.s",
-		"9syscall/await.s",
-		"9syscall/bind.s",
-		"9syscall/brk_.s",
-		"9syscall/chdir.s",
-		"9syscall/close.s",
-		"9syscall/create.s",
-		"9syscall/dup.s",
-		"9syscall/errstr.s",
-		"9syscall/exec.s",
-		"9syscall/_exits.s",
-		"9syscall/fauth.s",
-		"9syscall/fd2path.s",
-		"9syscall/fstat.s",
-		"9syscall/fversion.s",
-		"9syscall/fwstat.s",
-		"9syscall/mount.s",
-		"9syscall/noted.s",
-		"9syscall/notify.s",
-		"9syscall/nsec.s",
-		"9syscall/open.s",
-		"9syscall/pipe.s",
-		"9syscall/pread.s",
-		"9syscall/pwrite.s",
-		"9syscall/r0.s",
-		"9syscall/remove.s",
-		"9syscall/rendezvous.s",
-		"9syscall/rfork.s",
-		"9syscall/seek.s",
-		"9syscall/segattach.s",
-		"9syscall/segbrk.s",
-		"9syscall/segdetach.s",
-		"9syscall/segflush.s",
-		"9syscall/segfree.s",
-		"9syscall/semacquire.s",
-		"9syscall/semrelease.s",
-		"9syscall/sleep.s",
-		"9syscall/stat.s",
-		"9syscall/tsemacquire.s",
-		"9syscall/unmount.s",
-		"9syscall/wstat.s",
-		"fmt/dofmt.c",
-		"fmt/dorfmt.c",
-		"fmt/errfmt.c",
-		"fmt/fltfmt.c",
-		"fmt/fmt.c",
-		"fmt/fmtfd.c",
-		"fmt/fmtlock.c",
-		"fmt/fmtprint.c",
-		"fmt/fmtquote.c",
-		"fmt/fmtrune.c",
-		"fmt/fmtstr.c",
-		"fmt/fmtvprint.c",
-		"fmt/fprint.c",
-		"fmt/print.c",
-		"fmt/runefmtstr.c",
-		"fmt/runeseprint.c",
-		"fmt/runesmprint.c",
-		"fmt/runesnprint.c",
-		"fmt/runesprint.c",
-		"fmt/runevseprint.c",
-		"fmt/runevsmprint.c",
-		"fmt/runevsnprint.c",
-		"fmt/seprint.c",
-		"fmt/smprint.c",
-		"fmt/snprint.c",
-		"fmt/sprint.c",
-		"fmt/vfprint.c",
-		"fmt/vseprint.c",
-		"fmt/vsmprint.c",
-		"fmt/vsnprint.c",
-		"port/_assert.c",
-		"port/abs.c",
-		"port/asin.c",
-		"port/atan.c",
-		"port/atan2.c",
-		"port/atexit.c",
-		"port/atnotify.c",
-		"port/atof.c",
-		"port/atol.c",
-		"port/atoll.c",
-		"port/cistrcmp.c",
-		"port/cistrncmp.c",
-		"port/cistrstr.c",
-		"port/charstod.c",
-		"port/cleanname.c",
-		"port/configstring.c",
-		"port/ctype.c",
-		"port/encodefmt.c",
-		"port/execl.c",
-		"port/exp.c",
-		"port/fabs.c",
-		"port/floor.c",
-		"port/fmod.c",
-		"port/frand.c",
-		"port/frexp.c",
-		"port/getfields.c",
-		"port/getuser.c",
-		"port/hangup.c",
-		"port/hypot.c",
-		"port/lnrand.c",
-		"port/lock.c",
-		"port/log.c",
-		"port/lrand.c",
-		"port/malloc.c",
-		"port/memccpy.c",
-		"port/memchr.c",
-		"port/memcmp.c",
-		"port/memmove.c",
-		"port/memset.c",
-		"port/mktemp.c",
-		"port/muldiv.c",
-		"port/nan.c",
-		"port/needsrcquote.c",
-		"port/netmkaddr.c",
-		"port/nrand.c",
-		"port/ntruerand.c",
-		"port/perror.c",
-		"port/pool.c",
-		"port/pow.c",
-		"port/pow10.c",
-		"port/qsort.c",
-		"port/quote.c",
-		"port/rand.c",
-		"port/readn.c",
-		"port/reallocarray.c",
-		"port/rijndael.c",
-		"port/rune.c",
-		"port/runebase.c",
-		"port/runebsearch.c",
-		"port/runestrcat.c",
-		"port/runestrchr.c",
-		"port/runestrcmp.c",
-		"port/runestrcpy.c",
-		"port/runestrecpy.c",
-		"port/runestrdup.c",
-		"port/runestrncat.c",
-		"port/runestrncmp.c",
-		"port/runestrncpy.c",
-		"port/runestrrchr.c",
-		"port/runestrlen.c",
-		"port/runestrstr.c",
-		"port/runetype.c",
-		"port/sha2.c",
-		"port/sin.c",
-		"port/sinh.c",
-		"port/slice.c",
-		"port/strcat.c",
-		"port/strchr.c",
-		"port/strcmp.c",
-		"port/strcpy.c",
-		"port/strecpy.c",
-		"port/strcspn.c",
-		"port/strdup.c",
-		"port/strlcat.c",
-		"port/strlcpy.c",
-		"port/strlen.c",
-		"port/strncat.c",
-		"port/strncmp.c",
-		"port/strncpy.c",
-		"port/strpbrk.c",
-		"port/strrchr.c",
-		"port/strspn.c",
-		"port/strstr.c",
-		"port/strtod.c",
-		"port/strtok.c",
-		"port/strtol.c",
-		"port/strtoll.c",
-		"port/strtoul.c",
-		"port/strtoull.c",
-		"port/tan.c",
-		"port/tanh.c",
-		"port/tokenize.c",
-		"port/toupper.c",
-		"port/utfecpy.c",
-		"port/utflen.c",
-		"port/utfnlen.c",
-		"port/utfrune.c",
-		"port/utfrrune.c",
-		"port/utfutf.c",
-		"port/u16.c",
-		"port/u32.c",
-		"port/u64.c"
+	"Libc": {
+		"Cflags": [
+			"-fasm"
+		],
+		"Include": [
+			"../lib.json",
+			"$ARCH/build.json"
+		],
+		"Install": "/$ARCH/lib/",
+		"Library": "libc.a",
+		"Projects": [
+			"9syscall/9syscall.json"
+		],
+		"SourceFiles": [
+			"9sys/access.c",
+			"9sys/announce.c",
+			"9sys/convD2M.c",
+			"9sys/convM2D.c",
+			"9sys/convM2S.c",
+			"9sys/convS2M.c",
+			"9sys/cputime.c",
+			"9sys/ctime.c",
+			"9sys/dial.c",
+			"9sys/dirfstat.c",
+			"9sys/dirfwstat.c",
+			"9sys/dirmodefmt.c",
+			"9sys/dirread.c",
+			"9sys/dirstat.c",
+			"9sys/dirwstat.c",
+			"9sys/fcallfmt.c",
+			"9sys/fork.c",
+			"9sys/getnetconninfo.c",
+			"9sys/getenv.c",
+			"9sys/getpid.c",
+			"9sys/getppid.c",
+			"9sys/getwd.c",
+			"9sys/iounit.c",
+			"9sys/nulldir.c",
+			"9sys/postnote.c",
+			"9sys/privalloc.c",
+			"9sys/pushssl.c",
+			"9sys/pushtls.c",
+			"9sys/putenv.c",
+			"9sys/qlock.c",
+			"9sys/read9pmsg.c",
+			"9sys/read.c",
+			"9sys/readv.c",
+			"9sys/rerrstr.c",
+			"9sys/sbrk.c",
+			"9sys/setnetmtpt.c",
+			"9sys/sysfatal.c",
+			"9sys/syslog.c",
+			"9sys/sysname.c",
+			"9sys/time.c",
+			"9sys/times.c",
+			"9sys/tm2sec.c",
+			"9sys/truerand.c",
+			"9sys/wait.c",
+			"9sys/waitpid.c",
+			"9sys/werrstr.c",
+			"9sys/write.c",
+			"9sys/writev.c",
+			"9syscall/alarm.s",
+			"9syscall/await.s",
+			"9syscall/bind.s",
+			"9syscall/brk_.s",
+			"9syscall/chdir.s",
+			"9syscall/close.s",
+			"9syscall/create.s",
+			"9syscall/dup.s",
+			"9syscall/errstr.s",
+			"9syscall/exec.s",
+			"9syscall/_exits.s",
+			"9syscall/fauth.s",
+			"9syscall/fd2path.s",
+			"9syscall/fstat.s",
+			"9syscall/fversion.s",
+			"9syscall/fwstat.s",
+			"9syscall/mount.s",
+			"9syscall/noted.s",
+			"9syscall/notify.s",
+			"9syscall/nsec.s",
+			"9syscall/open.s",
+			"9syscall/pipe.s",
+			"9syscall/pread.s",
+			"9syscall/pwrite.s",
+			"9syscall/r0.s",
+			"9syscall/remove.s",
+			"9syscall/rendezvous.s",
+			"9syscall/rfork.s",
+			"9syscall/seek.s",
+			"9syscall/segattach.s",
+			"9syscall/segbrk.s",
+			"9syscall/segdetach.s",
+			"9syscall/segflush.s",
+			"9syscall/segfree.s",
+			"9syscall/semacquire.s",
+			"9syscall/semrelease.s",
+			"9syscall/sleep.s",
+			"9syscall/stat.s",
+			"9syscall/tsemacquire.s",
+			"9syscall/unmount.s",
+			"9syscall/wstat.s",
+			"fmt/dofmt.c",
+			"fmt/dorfmt.c",
+			"fmt/errfmt.c",
+			"fmt/fltfmt.c",
+			"fmt/fmt.c",
+			"fmt/fmtfd.c",
+			"fmt/fmtlock.c",
+			"fmt/fmtprint.c",
+			"fmt/fmtquote.c",
+			"fmt/fmtrune.c",
+			"fmt/fmtstr.c",
+			"fmt/fmtvprint.c",
+			"fmt/fprint.c",
+			"fmt/print.c",
+			"fmt/runefmtstr.c",
+			"fmt/runeseprint.c",
+			"fmt/runesmprint.c",
+			"fmt/runesnprint.c",
+			"fmt/runesprint.c",
+			"fmt/runevseprint.c",
+			"fmt/runevsmprint.c",
+			"fmt/runevsnprint.c",
+			"fmt/seprint.c",
+			"fmt/smprint.c",
+			"fmt/snprint.c",
+			"fmt/sprint.c",
+			"fmt/vfprint.c",
+			"fmt/vseprint.c",
+			"fmt/vsmprint.c",
+			"fmt/vsnprint.c",
+			"port/_assert.c",
+			"port/abs.c",
+			"port/asin.c",
+			"port/atan.c",
+			"port/atan2.c",
+			"port/atexit.c",
+			"port/atnotify.c",
+			"port/atof.c",
+			"port/atol.c",
+			"port/atoll.c",
+			"port/cistrcmp.c",
+			"port/cistrncmp.c",
+			"port/cistrstr.c",
+			"port/charstod.c",
+			"port/cleanname.c",
+			"port/configstring.c",
+			"port/ctype.c",
+			"port/encodefmt.c",
+			"port/execl.c",
+			"port/exp.c",
+			"port/fabs.c",
+			"port/floor.c",
+			"port/fmod.c",
+			"port/frand.c",
+			"port/frexp.c",
+			"port/getfields.c",
+			"port/getuser.c",
+			"port/hangup.c",
+			"port/hypot.c",
+			"port/lnrand.c",
+			"port/lock.c",
+			"port/log.c",
+			"port/lrand.c",
+			"port/malloc.c",
+			"port/memccpy.c",
+			"port/memchr.c",
+			"port/memcmp.c",
+			"port/memmove.c",
+			"port/memset.c",
+			"port/mktemp.c",
+			"port/muldiv.c",
+			"port/nan.c",
+			"port/needsrcquote.c",
+			"port/netmkaddr.c",
+			"port/nrand.c",
+			"port/ntruerand.c",
+			"port/perror.c",
+			"port/pool.c",
+			"port/pow.c",
+			"port/pow10.c",
+			"port/qsort.c",
+			"port/quote.c",
+			"port/rand.c",
+			"port/readn.c",
+			"port/reallocarray.c",
+			"port/rijndael.c",
+			"port/rune.c",
+			"port/runebase.c",
+			"port/runebsearch.c",
+			"port/runestrcat.c",
+			"port/runestrchr.c",
+			"port/runestrcmp.c",
+			"port/runestrcpy.c",
+			"port/runestrecpy.c",
+			"port/runestrdup.c",
+			"port/runestrncat.c",
+			"port/runestrncmp.c",
+			"port/runestrncpy.c",
+			"port/runestrrchr.c",
+			"port/runestrlen.c",
+			"port/runestrstr.c",
+			"port/runetype.c",
+			"port/sha2.c",
+			"port/sin.c",
+			"port/sinh.c",
+			"port/slice.c",
+			"port/strcat.c",
+			"port/strchr.c",
+			"port/strcmp.c",
+			"port/strcpy.c",
+			"port/strecpy.c",
+			"port/strcspn.c",
+			"port/strdup.c",
+			"port/strlcat.c",
+			"port/strlcpy.c",
+			"port/strlen.c",
+			"port/strncat.c",
+			"port/strncmp.c",
+			"port/strncpy.c",
+			"port/strpbrk.c",
+			"port/strrchr.c",
+			"port/strspn.c",
+			"port/strstr.c",
+			"port/strtod.c",
+			"port/strtok.c",
+			"port/strtol.c",
+			"port/strtoll.c",
+			"port/strtoul.c",
+			"port/strtoull.c",
+			"port/tan.c",
+			"port/tanh.c",
+			"port/tokenize.c",
+			"port/toupper.c",
+			"port/utfecpy.c",
+			"port/utflen.c",
+			"port/utfnlen.c",
+			"port/utfrune.c",
+			"port/utfrrune.c",
+			"port/utfutf.c",
+			"port/u16.c",
+			"port/u32.c",
+			"port/u64.c"
 		]
 	}
 }

+ 12 - 12
sys/src/libc/riscv/build.json

@@ -1,14 +1,14 @@
 {
-    "archfiles": {
-	"SourceFiles": [
-	    "$ARCH/notejmp.c",
-	    "$ARCH/argv0.c",
-	    "$ARCH/atomic.S",
-	    "port/getcallstack.c",
-	    "$ARCH/gettls.S",
-	    "$ARCH/main9.S",
-	    "$ARCH/setjmp.S",
-	    "$ARCH/sqrt.c"
-	]
-    }
+	"archfiles": {
+		"SourceFiles": [
+			"$ARCH/notejmp.c",
+			"$ARCH/argv0.c",
+			"$ARCH/atomic.S",
+			"port/getcallstack.c",
+			"$ARCH/gettls.S",
+			"$ARCH/main9.S",
+			"$ARCH/setjmp.S",
+			"$ARCH/sqrt.c"
+		]
+	}
 }

+ 13 - 12
sys/src/libfreetype/libfreetype.json

@@ -1,14 +1,15 @@
 {
-    "libfreetype": {
-        "Cflags": [
-            "-I", "include"
-        ],
-        "Include": [
-            "../lib.json"
-        ],
-        "Install": "/$ARCH/lib/",
-        "Library": "libfreetype.a",
-        "SourceFiles": [
+	"libfreetype": {
+		"Cflags": [
+			"-I",
+			"include"
+		],
+		"Include": [
+			"../lib.json"
+		],
+		"Install": "/$ARCH/lib/",
+		"Library": "libfreetype.a",
+		"SourceFiles": [
 			"src/winfonts/winfnt.c",
 			"src/type42/t42objs.c",
 			"src/type42/t42parse.c",
@@ -93,6 +94,6 @@
 			"src/autohint/ahglyph.c",
 			"src/autohint/ahhint.c",
 			"src/autohint/ahmodule.c"
-        ]
-    }
+		]
+	}
 }

+ 2 - 1
sys/src/libmach/libmach.json

@@ -1,7 +1,8 @@
 {
 	"libmach": {
 		"Cflags": [
-			"-I", "/"
+			"-I",
+			"/"
 		],
 		"Include": [
 			"../lib.json"

+ 7 - 8
sys/src/libusb/build.json

@@ -8,6 +8,9 @@
 		],
 		"Install": "/$ARCH/lib/",
 		"Library": "libusb.a",
+		"NotYet": [
+			"audio/audioctl.c"
+		],
 		"SourceFiles": [
 			"lib/dev.c",
 			"lib/devs.c",
@@ -15,9 +18,9 @@
 			"lib/parse.c",
 			"lib/fs.c",
 			"lib/fsdir.c",
-		    "audio/audioctl.c",
-		    "audio/audiofs.c",
-		    "audio/audiosub.c",
+			"audio/audioctl.c",
+			"audio/audiofs.c",
+			"audio/audiosub.c",
 			"disk/disk.c",
 			"disk/scsireq.c",
 			"ether/asix.c",
@@ -32,10 +35,6 @@
 			"serial/serial.c",
 			"serial/silabs.c",
 			"serial/ucons.c"
-		],
-	    "NotYet": [
-			"audio/audioctl.c"
-	    ]
-
+		]
 	}
 }

+ 3 - 3
sys/src/regress/fs/build.json

@@ -4,14 +4,14 @@
 			"/sys/src/cmd/cmd.json"
 		],
 		"Install": "/$ARCH/bin/regress/fs",
+		"Post": [
+			"cp fs.rc /$ARCH/bin/regress"
+		],
 		"SourceFilesCmd": [
 			"chdir.c",
 			"filewrite.c",
 			"filetree.c",
 			"filecreate.c"
-		],
-		"Post": [
-			"cp fs.rc /$ARCH/bin/regress"
 		]
 	}
 }

+ 61 - 61
sys/src/sysconf.json

@@ -1,4 +1,24 @@
 {
+	"Bootmethods": [
+		{
+			"Arg": "",
+			"Config": "configtcp",
+			"Connect": "connecttcp",
+			"Name": "tcp"
+		},
+		{
+			"Arg": "",
+			"Config": "configrc",
+			"Connect": "connectrc",
+			"Name": "rc"
+		},
+		{
+			"Arg": "",
+			"Config": "configlocal",
+			"Connect": "connectlocal",
+			"Name": "local"
+		}
+	],
 	"Syscalls": [
 		{
 			"Id": 0,
@@ -8,74 +28,74 @@
 			]
 		},
 		{
-			"Id": 2,
 			"Args": [
 				"char*",
 				"char*",
 				"int32_t"
 			],
+			"Id": 2,
 			"Name": "bind",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 3,
 			"Args": [
 				"char*"
 			],
+			"Id": 3,
 			"Name": "chdir",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 4,
 			"Args": [
 				"int32_t"
 			],
+			"Id": 4,
 			"Name": "close",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 5,
 			"Args": [
 				"int32_t",
 				"int32_t"
 			],
+			"Id": 5,
 			"Name": "dup",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 6,
 			"Args": [
 				"uint64_t"
 			],
+			"Id": 6,
 			"Name": "alarm",
 			"Ret": [
 				"int64_t"
 			]
 		},
 		{
-			"Id": 7,
 			"Args": [
 				"char*",
 				"char**"
 			],
+			"Id": 7,
 			"Name": "exec",
 			"Ret": [
 				"void*"
 			]
 		},
 		{
-			"Id": 8,
 			"Args": [
 				"char*"
 			],
+			"Id": 8,
 			"Libname": "_exits",
 			"Name": "exits",
 			"Ret": [
@@ -97,95 +117,95 @@
 			]
 		},
 		{
-			"Id": 14,
 			"Args": [
 				"char*",
 				"int32_t"
 			],
+			"Id": 14,
 			"Name": "open",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 19,
 			"Args": [
 				"int32_t"
 			],
+			"Id": 19,
 			"Name": "rfork",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 21,
 			"Args": [
 				"int32_t*"
 			],
+			"Id": 21,
 			"Name": "pipe",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 22,
 			"Args": [
 				"char*",
 				"int32_t",
 				"int32_t"
 			],
+			"Id": 22,
 			"Name": "create",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 23,
 			"Args": [
 				"int32_t",
 				"char*",
 				"uint32_t"
 			],
+			"Id": 23,
 			"Name": "fd2path",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 24,
 			"Args": [
 				"void*"
 			],
+			"Id": 24,
 			"Name": "brk_",
 			"Ret": [
 				"void*"
 			]
 		},
 		{
-			"Id": 25,
 			"Args": [
 				"char*"
 			],
+			"Id": 25,
 			"Name": "remove",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 28,
 			"Args": [
 				"void*"
 			],
+			"Id": 28,
 			"Name": "notify",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 29,
 			"Args": [
 				"int32_t"
 			],
+			"Id": 29,
 			"Name": "noted",
 			"Ret": [
 				"int32_t"
@@ -220,56 +240,56 @@
 			]
 		},
 		{
-			"Id": 34,
 			"Args": [
 				"void*"
 			],
+			"Id": 34,
 			"Name": "rendezvous",
 			"Ret": [
 				"void*"
 			]
 		},
 		{
-			"Id": 35,
 			"Args": [
 				"char*",
 				"char*"
 			],
+			"Id": 35,
 			"Name": "unmount",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 37,
 			"Args": [
 				"int32_t*",
 				"int32_t"
 			],
+			"Id": 37,
 			"Name": "semacquire",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 38,
 			"Args": [
 				"int32_t*",
 				"int32_t"
 			],
+			"Id": 38,
 			"Name": "semrelease",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 39,
 			"Args": [
 				"int64_t*",
 				"int32_t",
 				"int64_t",
 				"int32_t"
 			],
+			"Id": 39,
 			"Name": "seek",
 			"Ret": [
 				"int64_t"
@@ -283,130 +303,130 @@
 			]
 		},
 		{
-			"Id": 41,
 			"Args": [
 				"char*",
 				"uint32_t"
 			],
+			"Id": 41,
 			"Name": "errstr",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 42,
 			"Args": [
 				"char*",
 				"uint8_t*",
 				"uint32_t"
 			],
+			"Id": 42,
 			"Name": "stat",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 43,
 			"Args": [
 				"int32_t",
 				"uint8_t*",
 				"uint32_t"
 			],
+			"Id": 43,
 			"Name": "fstat",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 44,
 			"Args": [
 				"char*",
 				"uint8_t*",
 				"uint32_t"
 			],
+			"Id": 44,
 			"Name": "wstat",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 45,
 			"Args": [
 				"int32_t",
 				"uint8_t*",
 				"uint32_t"
 			],
+			"Id": 45,
 			"Name": "fwstat",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 46,
 			"Args": [
 				"int32_t",
 				"char*",
 				"int32_t",
 				"char*"
 			],
+			"Id": 46,
 			"Name": "mount",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 47,
 			"Args": [
 				"char*",
 				"int32_t"
 			],
+			"Id": 47,
 			"Name": "await",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 50,
 			"Args": [
 				"int32_t",
 				"void*",
 				"int32_t",
 				"int64_t"
 			],
+			"Id": 50,
 			"Name": "pread",
 			"Ret": [
 				"int32_t"
 			]
 		},
 		{
-			"Id": 51,
 			"Args": [
 				"int32_t",
 				"void*",
 				"int32_t",
 				"int64_t"
 			],
+			"Id": 51,
 			"Name": "pwrite",
 			"Ret": [
 				"int32_t"
 			]
 		},
-	    {
-		"Id": 17,
-		"Args": [
-		    "int64_t"
-		],
-		"Name": "sleep",
-		"Ret": [
-		    "int32_t"
-		]
-	    },
 		{
-			"Id": 52,
+			"Args": [
+				"int64_t"
+			],
+			"Id": 17,
+			"Name": "sleep",
+			"Ret": [
+				"int32_t"
+			]
+		},
+		{
 			"Args": [
 				"int32_t*",
 				"uint64_t"
 			],
+			"Id": 52,
 			"Name": "tsemacquire",
 			"Ret": [
 				"int32_t"
@@ -686,25 +706,5 @@
 			"Name": "Eunmount",
 			"String": "not mounted"
 		}
-	],
-	"Bootmethods": [
-		{
-			"Name": "tcp",
-			"Config": "configtcp",
-			"Connect": "connecttcp",
-			"Arg": ""
-		},
-		{
-			"Name": "rc",
-			"Config": "configrc",
-			"Connect": "connectrc",
-			"Arg": ""
-		},
-		{
-			"Name": "local",
-			"Config": "configlocal",
-			"Connect": "connectlocal",
-			"Arg": ""
-		}
 	]
 }