Skip to content

Commit 93262d9

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
Standardize build output directory to build/
Rename builds/ to build/ across Makefile, .gitignore, README, and example file comments. The build target now outputs all binaries (tools, commands, examples) to build/ with -o flags.
1 parent d6dc743 commit 93262d9

15 files changed

Lines changed: 28 additions & 27 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
*.test
44
*.out
55
*.prof
6-
/builds/
6+
/build/

Makefile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,16 @@ vet:
2929

3030
# Build all commands, tools, and examples.
3131
build:
32-
go build ./tools/cmd/...
33-
go build ./cmd/...
34-
@for d in examples/*/; do echo "Building $$d..."; go build "./$$d"; done
32+
@mkdir -p build
33+
@for d in tools/cmd/*/; do echo "Building $$d..."; go build -o "build/$$(basename $$d)" "./$$d"; done
34+
@for d in cmd/*/; do echo "Building $$d..."; go build -o "build/$$(basename $$d)" "./$$d"; done
35+
@for d in examples/*/; do echo "Building $$d..."; go build -o "build/$$(basename $$d)" "./$$d"; done
3536

3637
# Build bindercli release binaries for arm64 and amd64.
3738
release:
38-
@mkdir -p builds
39-
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o builds/bindercli-linux-arm64 ./cmd/bindercli/
40-
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o builds/bindercli-linux-amd64 ./cmd/bindercli/
39+
@mkdir -p build
40+
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o build/bindercli-linux-arm64 ./cmd/bindercli/
41+
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o build/bindercli-linux-amd64 ./cmd/bindercli/
4142

4243
# Run linter.
4344
lint:
@@ -57,8 +58,8 @@ genbindercli:
5758

5859
# Build the bindercli tool.
5960
bindercli:
60-
@mkdir -p builds
61-
go build -o builds/bindercli ./cmd/bindercli
61+
@mkdir -p build
62+
go build -o build/bindercli ./cmd/bindercli
6263

6364
# List all available bindercli subcommands.
6465
list-commands:

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ More examples: [`examples/`](examples/)
162162
**Install and deploy:**
163163

164164
```bash
165-
GOOS=linux GOARCH=arm64 go build -o bindercli ./cmd/bindercli/
166-
adb push bindercli /data/local/tmp/
165+
GOOS=linux GOARCH=arm64 go build -o build/bindercli ./cmd/bindercli/
166+
adb push build/bindercli /data/local/tmp/
167167
```
168168

169169
**Try it:**
@@ -189,8 +189,8 @@ See the full [bindercli reference](#bindercli) for all subcommands and more exam
189189
Binaries are pure Go (no CGO) and run directly on Android:
190190

191191
```bash
192-
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o list_services ./examples/list_services/
193-
adb push list_services /data/local/tmp/
192+
GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/list_services ./examples/list_services/
193+
adb push build/list_services /data/local/tmp/
194194
adb shell /data/local/tmp/list_services
195195
```
196196

@@ -1206,8 +1206,8 @@ Requires access to `/dev/binder` on the target device (typically available as `s
12061206
Build and deploy:
12071207

12081208
```bash
1209-
GOOS=linux GOARCH=arm64 go build -o bindercli ./cmd/bindercli/
1210-
adb push bindercli /data/local/tmp/
1209+
GOOS=linux GOARCH=arm64 go build -o build/bindercli ./cmd/bindercli/
1210+
adb push build/bindercli /data/local/tmp/
12111211
```
12121212

12131213
Core subcommands:

examples/activity_manager/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o activity_manager ./examples/activity_manager/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/activity_manager ./examples/activity_manager/
66
// adb push activity_manager /data/local/tmp/ && adb shell /data/local/tmp/activity_manager
77
package main
88

examples/audio_status/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o audio_status ./examples/audio_status/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/audio_status ./examples/audio_status/
66
// adb push audio_status /data/local/tmp/ && adb shell /data/local/tmp/audio_status
77
package main
88

examples/battery_health/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o battery_health ./examples/battery_health/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/battery_health ./examples/battery_health/
66
// adb push battery_health /data/local/tmp/ && adb shell /data/local/tmp/battery_health
77
package main
88

examples/device_info/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//
44
// Build:
55
//
6-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o device_info ./examples/device_info/
6+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/device_info ./examples/device_info/
77
// adb push device_info /data/local/tmp/ && adb shell /data/local/tmp/device_info
88
package main
99

examples/display_info/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o display_info ./examples/display_info/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/display_info ./examples/display_info/
66
// adb push display_info /data/local/tmp/ && adb shell /data/local/tmp/display_info
77
package main
88

examples/list_services/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o list_services ./examples/list_services/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/list_services ./examples/list_services/
66
// adb push list_services /data/local/tmp/ && adb shell /data/local/tmp/list_services
77
package main
88

examples/package_query/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// Build:
44
//
5-
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o package_query ./examples/package_query/
5+
// GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o build/package_query ./examples/package_query/
66
// adb push package_query /data/local/tmp/ && adb shell /data/local/tmp/package_query
77
package main
88

0 commit comments

Comments
 (0)