Browse Source

Transform (hopefully) all .json files to be arrays rather than objects

This is to guarantee order during build

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>
Graham MacDonald 1 year ago
parent
commit
7b159a3d9e
100 changed files with 400 additions and 299 deletions
  1. 4 3
      aarch64/cflags.json
  2. 4 3
      acme/bin/source/acd/build.json
  3. 4 3
      acme/bin/source/adict/build.json
  4. 6 4
      acme/bin/source/build.json
  5. 4 3
      acme/bin/source/win/build.json
  6. 4 3
      acme/build.json
  7. 4 3
      acme/mail/src/build.json
  8. 4 3
      acme/news/src/build.json
  9. 4 3
      acme/wiki/src/build.json
  10. 4 3
      amd64/cflags.json
  11. 4 3
      amd64/clang-3.4.json
  12. 4 3
      amd64/clang-3.5.json
  13. 4 3
      amd64/clang-3.6.json
  14. 4 3
      amd64/clang-3.7.json
  15. 4 3
      amd64/clang-3.8.json
  16. 4 3
      amd64/clang-3.9.json
  17. 4 3
      amd64/clang-4.0.json
  18. 4 3
      amd64/clang-6.0.json
  19. 4 3
      amd64/clang.json
  20. 4 3
      amd64/gcc-4.8.json
  21. 4 3
      amd64/gcc-5.json
  22. 4 3
      amd64/gcc-6.json
  23. 4 3
      amd64/gcc-7.json
  24. 4 3
      amd64/gcc-8.json
  25. 4 3
      amd64/gcc.json
  26. 4 3
      amd64/icc.json
  27. 4 3
      amd64/klib.json
  28. 4 3
      amd64/x86_64-elf-gcc.json
  29. 4 3
      amd64/x86_64-none-elf-gcc.json
  30. 4 3
      build.json
  31. 4 3
      clean.json
  32. 4 3
      riscv/cflags.json
  33. 4 3
      riscv/klib.json
  34. 4 3
      sys/src/9/386/386.json
  35. 4 3
      sys/src/9/aarch64/core.json
  36. 4 3
      sys/src/9/aarch64/cpu.json
  37. 4 3
      sys/src/9/aarch64/inith.json
  38. 4 3
      sys/src/9/aarch64/trivial.json
  39. 4 3
      sys/src/9/amd64/amd64coreboot.json
  40. 4 3
      sys/src/9/amd64/build.json
  41. 4 3
      sys/src/9/amd64/clean.json
  42. 4 3
      sys/src/9/amd64/core.json
  43. 4 3
      sys/src/9/amd64/inith.json
  44. 4 3
      sys/src/9/boot/boot.json
  45. 4 3
      sys/src/9/boot/bootconf.json
  46. 4 3
      sys/src/9/ip/ip.json
  47. 4 3
      sys/src/9/port/port.json
  48. 3 3
      sys/src/9/riscv/build.json
  49. 4 3
      sys/src/9/riscv/core.json
  50. 4 3
      sys/src/9/riscv/inith.json
  51. 4 3
      sys/src/9/ufs/ufs.json
  52. 4 3
      sys/src/bench/build.json
  53. 4 3
      sys/src/cleanlibs.json
  54. 4 3
      sys/src/cmd/9660srv/9660srv.json
  55. 4 3
      sys/src/cmd/acid/acid.json
  56. 4 3
      sys/src/cmd/acme/build.json
  57. 4 3
      sys/src/cmd/acpi/build.json
  58. 4 3
      sys/src/cmd/acpica/acpiexec/build.json
  59. 4 3
      sys/src/cmd/acpica/build.json
  60. 4 3
      sys/src/cmd/aquarela/build.json
  61. 4 3
      sys/src/cmd/aquarela/libsmb.json
  62. 4 3
      sys/src/cmd/astro/astro.json
  63. 4 3
      sys/src/cmd/auth/auth.json
  64. 4 3
      sys/src/cmd/auth/authsrv.json
  65. 4 3
      sys/src/cmd/auth/dsa2pub.json
  66. 4 3
      sys/src/cmd/auth/dsa2ssh.json
  67. 4 3
      sys/src/cmd/auth/factotum/factotum.json
  68. 4 3
      sys/src/cmd/auth/guard.srv.json
  69. 4 3
      sys/src/cmd/auth/lib/libauthcmd.json
  70. 4 3
      sys/src/cmd/auth/rsa2csr.json
  71. 4 3
      sys/src/cmd/auth/rsa2pub.json
  72. 4 3
      sys/src/cmd/auth/rsa2ssh.json
  73. 4 3
      sys/src/cmd/auth/rsa2x509.json
  74. 4 3
      sys/src/cmd/auth/rsafill.json
  75. 4 3
      sys/src/cmd/auth/secstore/aescbc.json
  76. 4 3
      sys/src/cmd/auth/secstore/secstore.json
  77. 4 3
      sys/src/cmd/auth/secstore/secstored.json
  78. 4 3
      sys/src/cmd/auth/secstore/secuser.json
  79. 4 3
      sys/src/cmd/aux/aux.json
  80. 4 3
      sys/src/cmd/aux/flashfs/dummyfs.json
  81. 4 3
      sys/src/cmd/aux/flashfs/flashfsbin.json
  82. 4 3
      sys/src/cmd/aux/flashfs/mkflashfs.json
  83. 4 3
      sys/src/cmd/aux/flashfs/testldfs.json
  84. 4 3
      sys/src/cmd/aux/gps/gps.json
  85. 4 3
      sys/src/cmd/aux/gps/gpsevermore.json
  86. 4 3
      sys/src/cmd/aux/mnihongo/mnihongo.json
  87. 4 3
      sys/src/cmd/aux/realemu/loadcom.json
  88. 4 3
      sys/src/cmd/aux/realemu/realemu.json
  89. 4 3
      sys/src/cmd/aux/vga/vga.json
  90. 4 3
      sys/src/cmd/bc/build.json
  91. 6 4
      sys/src/cmd/build.json
  92. 4 3
      sys/src/cmd/bzip2/bzip2.json
  93. 4 3
      sys/src/cmd/bzip2/lib/libbzip2.json
  94. 5 3
      sys/src/cmd/cb/cb.json
  95. 4 3
      sys/src/cmd/cdfs/cdfs.json
  96. 4 3
      sys/src/cmd/cfs/build.json
  97. 4 3
      sys/src/cmd/cifs/build.json
  98. 4 3
      sys/src/cmd/clean.json
  99. 4 3
      sys/src/cmd/cmd.json
  100. 0 0
      sys/src/cmd/cmux/build.json

+ 4 - 3
aarch64/cflags.json

@@ -1,5 +1,6 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-ffreestanding",
 			"-fno-builtin",
@@ -13,4 +14,4 @@
 			"-Werror"
 		]
 	}
-}
+]

+ 4 - 3
acme/bin/source/acd/build.json

@@ -1,5 +1,6 @@
-{
-	"acd": {
+[
+	{
+		"Name": "acd",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -15,4 +16,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 4 - 3
acme/bin/source/adict/build.json

@@ -1,5 +1,6 @@
-{
-	"adict": {
+[
+	{
+		"Name": "adict",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -10,4 +11,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 6 - 4
acme/bin/source/build.json

@@ -1,5 +1,6 @@
-{
-	"Cmd": {
+[
+	{
+		"Name": "cmd",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -9,11 +10,12 @@
 			"spout.c"
 		]
 	},
-	"Dirs": {
+	{
+		"Name": "dirs",
 		"Projects": [
 			"acd/build.json",
 			"adict/build.json",
 			"win/build.json"
 		]
 	}
-}
+]

+ 4 - 3
acme/bin/source/win/build.json

@@ -1,5 +1,6 @@
-{
-	"win": {
+[
+	{
+		"Name": "win",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 4 - 3
acme/build.json

@@ -1,5 +1,6 @@
-{
-	"all": {
+[
+	{
+		"Name": "acme",
 		"Projects": [
 			"mail/src/build.json",
 			"news/src/build.json",
@@ -7,4 +8,4 @@
 			"bin/source/build.json"
 		]
 	}
-}
+]

+ 4 - 3
acme/mail/src/build.json

@@ -1,5 +1,6 @@
-{
-	"Mail": {
+[
+	{
+		"Name": "mail",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -14,4 +15,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 4 - 3
acme/news/src/build.json

@@ -1,5 +1,6 @@
-{
-	"News": {
+[
+	{
+		"Name": "news",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -11,4 +12,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 4 - 3
acme/wiki/src/build.json

@@ -1,5 +1,6 @@
-{
-	"Wiki": {
+[
+	{
+		"Name": "wiki",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -12,4 +13,4 @@
 			"win.c"
 		]
 	}
-}
+]

+ 4 - 3
amd64/cflags.json

@@ -1,5 +1,6 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-ffreestanding",
 			"-fno-builtin",
@@ -25,4 +26,4 @@
 			"/$ARCH/$CC.json"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.4.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.5.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.6.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.7.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.8.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-3.9.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-4.0.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang-6.0.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/clang.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mno-implicit-float"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc-4.8.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc-5.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc-6.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc-7.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc-8.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/gcc.json

@@ -1,9 +1,10 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-fno-pie",
 			"-fvar-tracking",
 			"-fvar-tracking-assignments"
 		]
 	}
-}
+]

+ 4 - 3
amd64/icc.json

@@ -1,7 +1,8 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 				"-Wno-main
 			]
 	}
-}
+]

+ 4 - 3
amd64/klib.json

@@ -1,5 +1,6 @@
-{
-	"KernelLibs": {
+[
+	{
+		"Name": "KernelLibs",
 		"Cflags": [
 			"-mcmodel=kernel",
 			"-O0",
@@ -24,4 +25,4 @@
 			"rm -f -f *.o *.tag.*"
 		]
 	}
-}
+]

+ 4 - 3
amd64/x86_64-elf-gcc.json

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

+ 4 - 3
amd64/x86_64-none-elf-gcc.json

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

+ 4 - 3
build.json

@@ -1,5 +1,6 @@
-{
-	"all": {
+[
+	{
+		"Name": "all",
 		"Projects": [
 			"/sys/src/klibs.json",
 			"/sys/src/libs.json",
@@ -10,4 +11,4 @@
 			"/sys/src/9/$ARCH"
 		]
 	}
-}
+]

+ 4 - 3
clean.json

@@ -1,5 +1,6 @@
-{
-	"clean": {
+[
+	{
+		"Name": "clean",
 		"Pre": [
 			"rm -rf $ARCH/lib/*.a $ARCH/bin/*",
 			"rm -f cfg/pxe/tftpboot/harvey.32bit"
@@ -10,4 +11,4 @@
 			"/sys/src/cmd/clean.json"
 		]
 	}
-}
+]

+ 4 - 3
riscv/cflags.json

@@ -1,5 +1,6 @@
-{
-	"buildflags": {
+[
+	{
+		"Name": "buildflags",
 		"Cflags": [
 			"-mcmodel=medany",
 			"-ffreestanding",
@@ -19,4 +20,4 @@
 			"--no-relax"
 		]
 	}
-}
+]

+ 4 - 3
riscv/klib.json

@@ -1,5 +1,6 @@
-{
-	"KernelLibs": {
+[
+	{
+		"Name": "KernelLibs",
 		"Cflags": [
 			"-O0",
 			"-ffreestanding",
@@ -19,4 +20,4 @@
 			"rm -f -f *.o *.tag.*"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/386/386.json

@@ -1,5 +1,6 @@
-{
-	"386": {
+[
+	{
+		"Name": "386",
 		"SourceFiles": [
 			"../386/devrtc.c",
 			"../386/ether8169.c",
@@ -13,4 +14,4 @@
 			"../386/vgavesa.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/aarch64/core.json

@@ -1,5 +1,6 @@
-{
-	"core": {
+[
+	{
+		"Name": "core",
 		"Cflags": [
 			"-O0",
 			"-static",
@@ -51,4 +52,4 @@
 			"main.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/aarch64/cpu.json

@@ -1,5 +1,6 @@
-{
-	"aarch64cpu": {
+[
+	{
+		"Name": "aarch64cpu",
 		"Env": [
 			"CONF=aarch64cpu"
 		],
@@ -77,4 +78,4 @@
 			"main.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/aarch64/inith.json

@@ -1,5 +1,6 @@
-{
-	"inith": {
+[
+	{
+		"Name": "inith",
 		"Cflags": [
 			"-g",
 			"-Wall",
@@ -26,4 +27,4 @@
 			"../port/initcode.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/aarch64/trivial.json

@@ -1,5 +1,6 @@
-{
-	"aarch64cpu": {
+[
+	{
+		"Name": "aarch64cpu",
 		"Env": [
 			"CONF=aarch64cpu"
 		],
@@ -9,4 +10,4 @@
 			"main.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/amd64/amd64coreboot.json

@@ -1,5 +1,6 @@
-{
-	"amd64cpu": {
+[
+	{
+		"Name": "amd64cpu",
 		"Env": [
 			"CONF=amd64cpu"
 		],
@@ -119,4 +120,4 @@
 			"cbvga.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/amd64/build.json

@@ -1,5 +1,6 @@
-{
-	"cpu": {
+[
+	{
+		"Name": "cpu",
 		"Env": [
 			"CONF=cpu"
 		],
@@ -137,4 +138,4 @@
 			"vgax.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/amd64/clean.json

@@ -1,5 +1,6 @@
-{
-	"clean": {
+[
+	{
+		"Name": "clean",
 		"Pre": [
 			"rm -f *.o *.root.c *.out errstr.h init.h init cpu.c",
 			"rm -f ../boot/libboot.a ../boot/*.o ../boot/bootcpu.c ../boot/bootcpu.elf.out boot*.c",
@@ -7,4 +8,4 @@
 			"rm -f systab.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/amd64/core.json

@@ -1,5 +1,6 @@
-{
-	"core": {
+[
+	{
+		"Name": "core",
 		"Cflags": [
 			"-fno-stack-protector",
 			"-mcmodel=kernel",
@@ -107,4 +108,4 @@
 			"../port/virtio_lib.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/amd64/inith.json

@@ -1,5 +1,6 @@
-{
-	"inith": {
+[
+	{
+		"Name": "inith",
 		"Cflags": [
 			"-g",
 			"-Wall",
@@ -36,4 +37,4 @@
 			"../port/initcode.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/boot/boot.json

@@ -1,5 +1,6 @@
-{
-	"libboot": {
+[
+	{
+		"Name": "libboot",
 		"Cflags": [
 			"-g",
 			"-Wall",
@@ -31,4 +32,4 @@
 			"settime.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/boot/bootconf.json

@@ -1,5 +1,6 @@
-{
-	"bootcpu": {
+[
+	{
+		"Name": "bootcpu",
 		"Include": [
 			"/$ARCH/cflags.json"
 		],
@@ -30,4 +31,4 @@
 			"bootcpu.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/ip/ip.json

@@ -1,5 +1,6 @@
-{
-	"ip": {
+[
+	{
+		"Name": "ip",
 		"SourceFiles": [
 			"../ip/arp.c",
 			"../ip/chandial.c",
@@ -26,4 +27,4 @@
 			"../ip/udp.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/port/port.json

@@ -1,5 +1,6 @@
-{
-	"port": {
+[
+	{
+		"Name": "port",
 		"#SourceFiles": [
 			"../port/devcec.c"
 		],
@@ -80,4 +81,4 @@
 			"../port/watermarks.c"
 		]
 	}
-}
+]

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

@@ -1,5 +1,5 @@
-{
-	"riscvcpu": {
+[
+	{
 		"Env": [
 			"CONF=riscvcpu"
 		],
@@ -90,4 +90,4 @@
 			"riscvcpu.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/riscv/core.json

@@ -1,5 +1,6 @@
-{
-	"core": {
+[
+	{
+		"Name": "core",
 		"Cflags": [
 			"-mcmodel=medany",
 			"-O0",
@@ -67,4 +68,4 @@
 			"uart.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/riscv/inith.json

@@ -1,5 +1,6 @@
-{
-	"inith": {
+[
+	{
+		"Name": "inith",
 		"Cflags": [
 			"-g",
 			"-Wall",
@@ -28,4 +29,4 @@
 			"../port/initcode.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/9/ufs/ufs.json

@@ -1,5 +1,6 @@
-{
-	"ufs": {
+[
+	{
+		"Name": "ufs",
 		"Cflags": [
 			"-fasm",
 			"-I",
@@ -33,4 +34,4 @@
 			"../ufs/ufs_harvey_vnode.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/bench/build.json

@@ -1,5 +1,6 @@
-{
-	"Bench": {
+[
+	{
+		"Name": "bench",
 		"Include": [
 			"/sys/src/cmd/cmd.json"
 		],
@@ -8,4 +9,4 @@
 			"error.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cleanlibs.json

@@ -1,8 +1,9 @@
-{
-	"clean": {
+[
+	{
+		"Name": "clean",
 		"Pre": [
 			"rm -f libc/9syscall/*.s libc/9syscall/sys.h",
 			"rm -f libacpi/*.o"
 		]
 	}
-}
+]

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

@@ -1,5 +1,6 @@
-{
-	"9660srv": {
+[
+	{
+		"Name": "9660srv",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"xfile.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/acid/acid.json

@@ -1,5 +1,6 @@
-{
-	"acid": {
+[
+	{
+		"Name": "acid",
 		"CFlags": [
 			"-fplan9-extensions"
 		],
@@ -25,4 +26,4 @@
 			"y.tab.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/acme/build.json

@@ -1,5 +1,6 @@
-{
-	"acme": {
+[
+	{
+		"Name": "acme",
 		"CFlags": [],
 		"Include": [
 			"../cmd.json"
@@ -32,4 +33,4 @@
 			"xfid.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/acpi/build.json

@@ -1,5 +1,6 @@
-{
-	"irq": {
+[
+	{
+		"Name": "irq",
 		"Include": [
 			"/sys/src/libacpi/acpica/acpiflags.json",
 			"/sys/src/cmd/cmd.json"
@@ -19,4 +20,4 @@
 			"shutdown.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/acpica/acpiexec/build.json

@@ -1,5 +1,6 @@
-{
-	"aeexec": {
+[
+	{
+		"Name": "acpiexec",
 		"Include": [
 			"/sys/src/libacpi/acpica/acpiflags.json",
 			"/sys/src/cmd/cmd.json"
@@ -21,4 +22,4 @@
 			"aetables.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/acpica/build.json

@@ -1,7 +1,8 @@
-{
-	"acpica": {
+[
+	{
+		"Name": "acpica",
 		"NoProjectsSinceCanNotBuildOnRISCVYet": [
 			"acpiexec/"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aquarela/build.json

@@ -1,5 +1,6 @@
-{
-	"aquarela": {
+[
+	{
+		"Name": "aquarela",
 		"Include": [
 			"../cmd.json"
 		],
@@ -18,4 +19,4 @@
 			"cifscmd.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aquarela/libsmb.json

@@ -1,5 +1,6 @@
-{
-	"aquarela": {
+[
+	{
+		"Name": "libsmb",
 		"Include": [
 			"../../lib.json"
 		],
@@ -73,4 +74,4 @@
 			"smbtrans2set.c"
 		]
 	}
-}
+]

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

@@ -1,5 +1,6 @@
-{
-	"astro": {
+[
+	{
+		"Name": "astro",
 		"Include": [
 			"../cmd.json"
 		],
@@ -38,4 +39,4 @@
 			"venust.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/auth.json

@@ -1,5 +1,6 @@
-{
-	"Auth": {
+[
+	{
+		"Name": "auth",
 		"Include": [
 			"../cmd.json"
 		],
@@ -47,4 +48,4 @@
 			"wrkey.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/authsrv.json

@@ -1,5 +1,6 @@
-{
-	"authsrv": {
+[
+	{
+		"Name": "authsrv",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"secureidcheck.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/dsa2pub.json

@@ -1,5 +1,6 @@
-{
-	"dsa2pub": {
+[
+	{
+		"Name": "dsa2pub",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/dsa2ssh.json

@@ -1,5 +1,6 @@
-{
-	"dsa2ssh": {
+[
+	{
+		"Name": "dsa2ssh",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/factotum/factotum.json

@@ -1,5 +1,6 @@
-{
-	"factotum": {
+[
+	{
+		"Name": "factotum",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -23,4 +24,4 @@
 			"wep.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/guard.srv.json

@@ -1,5 +1,6 @@
-{
-	"guard.srv": {
+[
+	{
+		"Name": "guard.srv",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"secureidcheck.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/lib/libauthcmd.json

@@ -1,5 +1,6 @@
-{
-	"libauthcmd": {
+[
+	{
+		"Name": "libauthcmd",
 		"Cflags": [
 			"-I../"
 		],
@@ -25,4 +26,4 @@
 			"getexpiration.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/rsa2csr.json

@@ -1,5 +1,6 @@
-{
-	"rsa2csr": {
+[
+	{
+		"Name": "rsa2csr",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/rsa2pub.json

@@ -1,5 +1,6 @@
-{
-	"rsa2pub": {
+[
+	{
+		"Name": "rsa2pub",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/rsa2ssh.json

@@ -1,5 +1,6 @@
-{
-	"rsa2ssh": {
+[
+	{
+		"Name": "rsa2ssh",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/rsa2x509.json

@@ -1,5 +1,6 @@
-{
-	"rsa2x509": {
+[
+	{
+		"Name": "rsa2x509",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/rsafill.json

@@ -1,5 +1,6 @@
-{
-	"rsafill": {
+[
+	{
+		"Name": "rsafill",
 		"Include": [
 			"../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"rsa2any.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/secstore/aescbc.json

@@ -1,5 +1,6 @@
-{
-	"aescbc": {
+[
+	{
+		"Name": "aescbc",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -10,4 +11,4 @@
 			"util.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/secstore/secstore.json

@@ -1,5 +1,6 @@
-{
-	"secstore": {
+[
+	{
+		"Name": "secstore",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -18,4 +19,4 @@
 			"util.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/secstore/secstored.json

@@ -1,5 +1,6 @@
-{
-	"secstored": {
+[
+	{
+		"Name": "secstored",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -15,4 +16,4 @@
 			"util.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/auth/secstore/secuser.json

@@ -1,5 +1,6 @@
-{
-	"secuser": {
+[
+	{
+		"Name": "secuser",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -13,4 +14,4 @@
 			"util.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/aux.json

@@ -1,5 +1,6 @@
-{
-	"Aux": {
+[
+	{
+		"Name": "Aux",
 		"CFlags": [],
 		"Include": [
 			"../cmd.json"
@@ -51,4 +52,4 @@
 			"flashfs/flashfs.json"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/flashfs/dummyfs.json

@@ -1,5 +1,6 @@
-{
-	"dummyfs": {
+[
+	{
+		"Name": "dummyfs",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -14,4 +15,4 @@
 			"utils.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/flashfs/flashfsbin.json

@@ -1,5 +1,6 @@
-{
-	"flashfsbin": {
+[
+	{
+		"Name": "flashfsbin",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -16,4 +17,4 @@
 			"utils.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/flashfs/mkflashfs.json

@@ -1,5 +1,6 @@
-{
-	"mkflashfs": {
+[
+	{
+		"Name": "mkflashfs",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -11,4 +12,4 @@
 			"utils.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/flashfs/testldfs.json

@@ -1,5 +1,6 @@
-{
-	"testldfs": {
+[
+	{
+		"Name": "testldfs",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -15,4 +16,4 @@
 			"utils.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/gps/gps.json

@@ -1,5 +1,6 @@
-{
-	"gpsfs": {
+[
+	{
+		"Name": "gpsfs",
 		"CFlags": [],
 		"Include": [
 			"../../cmd.json"
@@ -14,4 +15,4 @@
 			"gpsfs.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/gps/gpsevermore.json

@@ -1,5 +1,6 @@
-{
-	"gpsevermore": {
+[
+	{
+		"Name": "gpsevermore",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -10,4 +11,4 @@
 			"gpsevermore.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/mnihongo/mnihongo.json

@@ -1,5 +1,6 @@
-{
-	"mnihongo": {
+[
+	{
+		"Name": "mnihongo",
 		"Include": [
 			"../../cmd.json"
 		],
@@ -9,4 +10,4 @@
 			"mnihongo.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/realemu/loadcom.json

@@ -1,5 +1,6 @@
-{
-	"Loadcom": {
+[
+	{
+		"Name": "Loadcom",
 		"Cflags": [
 			"-I",
 			"/"
@@ -12,4 +13,4 @@
 			"loadcom.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/realemu/realemu.json

@@ -1,5 +1,6 @@
-{
-	"realemu": {
+[
+	{
+		"Name": "realemu",
 		"Cflags": [
 			"-I",
 			"/"
@@ -19,4 +20,4 @@
 			"xec.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/aux/vga/vga.json

@@ -1,5 +1,6 @@
-{
-	"vga": {
+[
+	{
+		"Name": "vga",
 		"Cflags": [
 			"-I",
 			"/"
@@ -52,4 +53,4 @@
 			"vision964.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/bc/build.json

@@ -1,5 +1,6 @@
-{
-	"bc": {
+[
+	{
+		"Name": "bc",
 		"Include": [
 			"../cmd.json"
 		],
@@ -15,4 +16,4 @@
 			"y.tab.c"
 		]
 	}
-}
+]

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

@@ -1,5 +1,6 @@
-{
-	"Cmd": {
+[
+	{
+		"Name": "Cmd",
 		"CFlags": [],
 		"Include": [
 			"cmd.json"
@@ -9,7 +10,8 @@
 			"*.c"
 		]
 	},
-	"Dirs": {
+	{
+		"Name": "Dirs",
 		"Include": [
 			"cmd.json"
 		],
@@ -78,4 +80,4 @@
 			"zenith/build.json"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/bzip2/bzip2.json

@@ -1,5 +1,6 @@
-{
-	"bzip2": {
+[
+	{
+		"Name": "bzip2",
 		"Cflags": [
 			"-DPLAN9"
 		],
@@ -21,4 +22,4 @@
 			"bzip2.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/bzip2/lib/libbzip2.json

@@ -1,5 +1,6 @@
-{
-	"libbzip2": {
+[
+	{
+		"Name": "libbzip2",
 		"Cflags": [
 			"-DPLAN9"
 		],
@@ -26,4 +27,4 @@
 			"randtable.c"
 		]
 	}
-}
+]

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

@@ -1,5 +1,6 @@
-{
-	"cb": {
+[
+	{
+		"Name": "cb",
 		"Include": [
 			"../cmd.json"
 		],
@@ -10,4 +11,5 @@
 			"cbtype.c"
 		]
 	}
-}
+]
+

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

@@ -1,5 +1,6 @@
-{
-	"cdfs": {
+[
+	{
+		"Name": "cdfs",
 		"Include": [
 			"../cmd.json"
 		],
@@ -12,4 +13,4 @@
 			"scsi.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/cfs/build.json

@@ -1,5 +1,6 @@
-{
-	"cfs": {
+[
+	{
+		"Name": "cfs",
 		"Include": [
 			"../cmd.json"
 		],
@@ -9,4 +10,4 @@
 			"*.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/cifs/build.json

@@ -1,5 +1,6 @@
-{
-	"cifs": {
+[
+	{
+		"Name": "cifs",
 		"Include": [
 			"../cmd.json"
 		],
@@ -25,4 +26,4 @@
 			"ping.c"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/clean.json

@@ -1,7 +1,8 @@
-{
-	"clean": {
+[
+	{
+		"Name": "clean",
 		"Pre": [
 			"rm -f auth/lib/libauthcmd.a ip/httpd/libhttps.a usb/usbd/devtab.c venti/srv/libvs.a"
 		]
 	}
-}
+]

+ 4 - 3
sys/src/cmd/cmd.json

@@ -1,5 +1,6 @@
-{
-	"Cmd": {
+[
+	{
+		"Name": "cmd",
 		"Include": [
 			"/$ARCH/cflags.json"
 		],
@@ -48,4 +49,4 @@
 			"rm -f *.tag.*"
 		]
 	}
-}
+]

+ 0 - 0
sys/src/cmd/cmux/build.json


Some files were not shown because too many files changed in this diff