Browse Source

build: make sure directories in installpath all exist

Here are the example changes. Works great!

We need to fix all our .json's to use "Install" and we can then remove
ALL mkdirs from BUILD and .json files.

Change-Id: I7cc0653c851f2de1db70e2e059f6acdffe0f6a77
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 8 years ago
parent
commit
6ec5ed7a5d

+ 1 - 40
sys/src/cmd/aux/aux.json

@@ -7,8 +7,6 @@
 	"vga/vga.json"
 	],
 	"Include": ["../cmd.json"],
-	"Pre": [
-	],
 	"SourceFilesCmd": [
 	"9pcon.c",
 	"accupoint.c",
@@ -46,42 +44,5 @@
 	"write.c",
 	"zerotrunc.c"
 	],
-	"Post": [
-	"mkdir -p $HARVEY/amd64/bin/aux",
-	"mv 9pcon $HARVEY/amd64/bin/aux/",
-	"mv accupoint $HARVEY/amd64/bin/aux/",
-	"mv acidleak $HARVEY/amd64/bin/aux/",
-	"mv apm $HARVEY/amd64/bin/aux/",
-	"mv astarld $HARVEY/amd64/bin/aux/",
-	"mv cddb $HARVEY/amd64/bin/aux/",
-	"mv clog $HARVEY/amd64/bin/aux/",
-	"mv consolefs $HARVEY/amd64/bin/aux/",
-	"mv data2s $HARVEY/amd64/bin/aux/",
-	"mv depend $HARVEY/amd64/bin/aux/",
-	"mv disksim $HARVEY/amd64/bin/aux/",
-	"mv getflags $HARVEY/amd64/bin/aux/",
-	"mv lines $HARVEY/amd64/bin/aux/",
-	"mv listen $HARVEY/amd64/bin/aux/",
-	"mv listen1 $HARVEY/amd64/bin/aux/",
-	"mv mklatinkbd $HARVEY/amd64/bin/aux/",
-	"mv ms2 $HARVEY/amd64/bin/aux/",
-	"mv msexceltables $HARVEY/amd64/bin/aux/",
-	"mv mswordstrings $HARVEY/amd64/bin/aux/",
-	"mv mouse $HARVEY/amd64/bin/aux/",
-	"mv nfsmount $HARVEY/amd64/bin/aux/",
-	"mv olefs $HARVEY/amd64/bin/aux/",
-	"mv pcmcia $HARVEY/amd64/bin/aux/",
-	"mv portmap $HARVEY/amd64/bin/aux/",
-	"mv rdwr $HARVEY/amd64/bin/aux/",
-	"mv reboot $HARVEY/amd64/bin/aux/",
-	"mv searchfs $HARVEY/amd64/bin/aux/",
-	"mv statusbar $HARVEY/amd64/bin/aux/",
-	"mv stub $HARVEY/amd64/bin/aux/",
-	"mv timesync $HARVEY/amd64/bin/aux/",
-	"mv trampoline $HARVEY/amd64/bin/aux/",
-	"mv usage $HARVEY/amd64/bin/aux/",
-	"mv watchdog $HARVEY/amd64/bin/aux/",
-	"mv write $HARVEY/amd64/bin/aux/",
-	"mv zerotrunc $HARVEY/amd64/bin/aux/"
-	]
+	"Install": "/$ARCH/bin/aux"
 }

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

@@ -12,7 +12,5 @@
     "devfs.c",
     "utils.c"
 	],
-	"Post": [
-    "mv dummyfs $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -14,7 +14,5 @@
     "conv.c",
     "utils.c"
 	],
-	"Post": [
-    "mv flashfs $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -9,7 +9,5 @@
     "devfs.c",
     "utils.c"
 	],
-	"Post": [
-    "mv mkflashfs $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -13,7 +13,5 @@
     "conv.c",
     "utils.c"
 	],
-	"Post": [
-    "mv testldfs $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -11,7 +11,5 @@
     "util.c",
     "gpsfs.c"
 	],
-	"Post": [
-    "mv gpsfs $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -8,7 +8,5 @@
     "util.c",
     "gpsevermore.c"
 	],
-	"Post": [
-    "mv gpsevermore $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

+ 1 - 5
sys/src/cmd/aux/mnihongo/mnihongo.json

@@ -2,12 +2,8 @@
     "Name": "mnihongo",
     "Program": "mnihongo",
     "Include": ["../../cmd.json"],
-    "Pre": [
-	],
     "SourceFiles": [
 	"mnihongo.c"
 	],
-	"Post": [
-	"mv mnihongo $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

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

@@ -65,7 +65,5 @@
     "vesadb.c",
     "vision964.c"
 	],
-	"Post": [
-    "mv vga $HARVEY/amd64/bin/aux/"
-	]
+    "Install": "/$ARCH/bin/aux"
 }

+ 0 - 4
sys/src/cmd/cmds.json

@@ -18,8 +18,6 @@
 	"fossil/fossil.json"
 	],
 	"Include": ["cmd.json"],
-	"Pre": [
-	],
 	"SourceFilesCmd": [
 	"aan.c",
 	"archfs.c",
@@ -142,7 +140,5 @@
 	"xd.c",
 	"yacc.c"
 	],
-	"Post": [
-	],
 	"Install": "/$ARCH/bin/"
 }

+ 6 - 0
util/build.go

@@ -195,6 +195,12 @@ func install(b *build) {
 		return
 	}
 	installpath := adjust([]string{os.ExpandEnv(b.Install)})
+	// Make sure they're all there.
+	for _, v := range installpath {
+		if err := os.MkdirAll(v, 0755); err != nil {
+			log.Fatalf("%v", err)
+		}
+	}
 
 	if len(b.SourceFilesCmd) > 0 {
 		for _, n := range b.SourceFilesCmd {