Skip to content

Commit 7406b09

Browse files
evanwevanw
committed
organize make platform-all output in Makefile 
1 parent a4cd5fd commit 7406b09

3 files changed

Lines changed: 109 additions & 100 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
echo "GO_VERSION=$(cat go.version)" >> $GITHUB_ENV
2626
27-
- name: Set up Go 1.x
27+
- name: Set up Go ${{ env.GO_VERSION }}
2828
uses: actions/setup-go@v3
2929
with:
3030
go-version: ${{ env.GO_VERSION }}
@@ -36,7 +36,9 @@ jobs:
3636
node-version: 18
3737

3838
- name: Ensure all platforms can be built
39-
run: make platform-all
39+
run: |
40+
git status
41+
make platform-all
4042
4143
# Plan 9 is not a supported platform, but someone wanted esbuild to be able to build for it anyway...
4244
- name: Ensure esbuild can be built for Plan 9

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
# This updates the version in all "package.json" files
5555
- name: Build for all platforms
5656
run: |
57+
git status
5758
make platform-all
5859
5960
# All "package.json" files should have been updated already by running "make platform-all" and committing the results

‎Makefile‎

Lines changed: 104 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -316,146 +316,152 @@ test-yarnpnp: platform-wasm
316316
version-go:
317317
node scripts/esbuild.js --update-version-go
318318

319-
platform-all: go-compiler
320-
@$(MAKE) --no-print-directory -j4 \
321-
platform-aix-ppc64 \
322-
platform-android-arm \
323-
platform-android-arm64 \
324-
platform-android-x64 \
325-
platform-darwin-arm64 \
326-
platform-darwin-x64 \
327-
platform-deno \
328-
platform-freebsd-arm64 \
329-
platform-freebsd-x64 \
330-
platform-linux-arm \
331-
platform-linux-arm64 \
332-
platform-linux-ia32 \
333-
platform-linux-loong64 \
334-
platform-linux-mips64el \
335-
platform-linux-ppc64 \
336-
platform-linux-riscv64 \
337-
platform-linux-s390x \
338-
platform-linux-x64 \
339-
platform-netbsd-arm64 \
340-
platform-netbsd-x64 \
341-
platform-neutral \
342-
platform-openbsd-arm64 \
343-
platform-openbsd-x64 \
344-
platform-openharmony-arm64 \
345-
platform-sunos-x64 \
346-
platform-wasi-preview1 \
347-
platform-wasm \
348-
platform-win32-arm64 \
349-
platform-win32-ia32 \
350-
platform-win32-x64
319+
platform-all: \
320+
platform-aix-ppc64 \
321+
platform-android-arm \
322+
platform-android-arm64 \
323+
platform-android-x64 \
324+
platform-darwin-arm64 \
325+
platform-darwin-x64 \
326+
platform-deno \
327+
platform-freebsd-arm64 \
328+
platform-freebsd-x64 \
329+
platform-linux-arm \
330+
platform-linux-arm64 \
331+
platform-linux-ia32 \
332+
platform-linux-loong64 \
333+
platform-linux-mips64el \
334+
platform-linux-ppc64 \
335+
platform-linux-riscv64 \
336+
platform-linux-s390x \
337+
platform-linux-x64 \
338+
platform-netbsd-arm64 \
339+
platform-netbsd-x64 \
340+
platform-neutral \
341+
platform-openbsd-arm64 \
342+
platform-openbsd-x64 \
343+
platform-openharmony-arm64 \
344+
platform-sunos-x64 \
345+
platform-wasi-preview1 \
346+
platform-wasm \
347+
platform-win32-arm64 \
348+
platform-win32-ia32 \
349+
platform-win32-x64
350+
351+
platform-internal:
352+
@test -n "$(GOOS)" || (echo "The environment variable GOOS must be provided" && false)
353+
@test -n "$(GOARCH)" || (echo "The environment variable GOARCH must be provided" && false)
354+
@test -n "$(NPMDIR)" || (echo "The environment variable NPMDIR must be provided" && false)
355+
@test -n "$(BINPATH)" || (echo "The environment variable BINPATH must be provided" && false)
356+
@echo
357+
@echo "# Build: $(NPMDIR)"
358+
node scripts/esbuild.js "$(NPMDIR)/package.json" --version
359+
$(GO_COMPILER) GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "$(NPMDIR)/$(BINPATH)" ./cmd/esbuild
360+
@shasum -a 256 "$(NPMDIR)/$(BINPATH)"
351361

352362
platform-win32-x64: version-go go-compiler
353-
node scripts/esbuild.js npm/@esbuild/win32-x64/package.json --version
354-
$(GO_COMPILER) GOOS=windows GOARCH=amd64 go build $(GO_FLAGS) -o npm/@esbuild/win32-x64/esbuild.exe ./cmd/esbuild
355-
@shasum -a 256 npm/@esbuild/win32-x64/esbuild.exe
363+
@$(MAKE) --no-print-directory GOOS=windows GOARCH=amd64 NPMDIR=npm/@esbuild/win32-ia32 BINPATH=esbuild.exe platform-internal
356364

357365
platform-win32-ia32: version-go go-compiler
358-
node scripts/esbuild.js npm/@esbuild/win32-ia32/package.json --version
359-
$(GO_COMPILER) GOOS=windows GOARCH=386 go build $(GO_FLAGS) -o npm/@esbuild/win32-ia32/esbuild.exe ./cmd/esbuild
360-
@shasum -a 256 npm/@esbuild/win32-ia32/esbuild.exe
366+
@$(MAKE) --no-print-directory GOOS=windows GOARCH=386 NPMDIR=npm/@esbuild/win32-ia32 BINPATH=esbuild.exe platform-internal
361367

362368
platform-win32-arm64: version-go go-compiler
363-
node scripts/esbuild.js npm/@esbuild/win32-arm64/package.json --version
364-
$(GO_COMPILER) GOOS=windows GOARCH=arm64 go build $(GO_FLAGS) -o npm/@esbuild/win32-arm64/esbuild.exe ./cmd/esbuild
365-
@shasum -a 256 npm/@esbuild/win32-arm64/esbuild.exe
369+
@$(MAKE) --no-print-directory GOOS=windows GOARCH=arm64 NPMDIR=npm/@esbuild/win32-arm64 BINPATH=esbuild.exe platform-internal
366370

367371
platform-wasi-preview1: version-go go-compiler
368-
node scripts/esbuild.js npm/@esbuild/wasi-preview1/package.json --version
369-
$(GO_COMPILER) GOOS=wasip1 GOARCH=wasm go build $(GO_FLAGS) -o npm/@esbuild/wasi-preview1/esbuild.wasm ./cmd/esbuild
370-
@shasum -a 256 npm/@esbuild/wasi-preview1/esbuild.wasm
372+
@$(MAKE) --no-print-directory GOOS=wasip1 GOARCH=wasm NPMDIR=npm/@esbuild/wasi-preview1 BINPATH=esbuild.wasm platform-internal
371373

372-
platform-unixlike: version-go go-compiler
373-
@test -n "$(GOOS)" || (echo "The environment variable GOOS must be provided" && false)
374-
@test -n "$(GOARCH)" || (echo "The environment variable GOARCH must be provided" && false)
375-
@test -n "$(NPMDIR)" || (echo "The environment variable NPMDIR must be provided" && false)
376-
node scripts/esbuild.js "$(NPMDIR)/package.json" --version
377-
$(GO_COMPILER) GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "$(NPMDIR)/bin/esbuild" ./cmd/esbuild
378-
@shasum -a 256 "$(NPMDIR)/bin/esbuild"
374+
platform-aix-ppc64: version-go go-compiler
375+
@$(MAKE) --no-print-directory GOOS=aix GOARCH=ppc64 NPMDIR=npm/@esbuild/aix-ppc64 BINPATH=bin/esbuild platform-internal
379376

380-
platform-android-x64: platform-wasm
381-
node scripts/esbuild.js npm/@esbuild/android-x64/package.json --version
377+
platform-android-arm64: version-go go-compiler
378+
@$(MAKE) --no-print-directory GOOS=android GOARCH=arm64 NPMDIR=npm/@esbuild/android-arm64 BINPATH=bin/esbuild platform-internal
382379

383-
platform-android-arm: platform-wasm
384-
node scripts/esbuild.js npm/@esbuild/android-arm/package.json --version
380+
platform-darwin-x64: version-go go-compiler
381+
@$(MAKE) --no-print-directory GOOS=darwin GOARCH=amd64 NPMDIR=npm/@esbuild/darwin-x64 BINPATH=bin/esbuild platform-internal
385382

386-
platform-openharmony-arm64: platform-wasm
387-
node scripts/esbuild.js npm/@esbuild/openharmony-arm64/package.json --version
383+
platform-darwin-arm64: version-go go-compiler
384+
@$(MAKE) --no-print-directory GOOS=darwin GOARCH=arm64 NPMDIR=npm/@esbuild/darwin-arm64 BINPATH=bin/esbuild platform-internal
388385

389-
platform-aix-ppc64:
390-
@$(MAKE) --no-print-directory GOOS=aix GOARCH=ppc64 NPMDIR=npm/@esbuild/aix-ppc64 platform-unixlike
386+
platform-freebsd-x64: version-go go-compiler
387+
@$(MAKE) --no-print-directory GOOS=freebsd GOARCH=amd64 NPMDIR=npm/@esbuild/freebsd-x64 BINPATH=bin/esbuild platform-internal
391388

392-
platform-android-arm64:
393-
@$(MAKE) --no-print-directory GOOS=android GOARCH=arm64 NPMDIR=npm/@esbuild/android-arm64 platform-unixlike
389+
platform-freebsd-arm64: version-go go-compiler
390+
@$(MAKE) --no-print-directory GOOS=freebsd GOARCH=arm64 NPMDIR=npm/@esbuild/freebsd-arm64 BINPATH=bin/esbuild platform-internal
394391

395-
platform-darwin-x64:
396-
@$(MAKE) --no-print-directory GOOS=darwin GOARCH=amd64 NPMDIR=npm/@esbuild/darwin-x64 platform-unixlike
392+
platform-netbsd-arm64: version-go go-compiler
393+
@$(MAKE) --no-print-directory GOOS=netbsd GOARCH=arm64 NPMDIR=npm/@esbuild/netbsd-arm64 BINPATH=bin/esbuild platform-internal
397394

398-
platform-darwin-arm64:
399-
@$(MAKE) --no-print-directory GOOS=darwin GOARCH=arm64 NPMDIR=npm/@esbuild/darwin-arm64 platform-unixlike
395+
platform-netbsd-x64: version-go go-compiler
396+
@$(MAKE) --no-print-directory GOOS=netbsd GOARCH=amd64 NPMDIR=npm/@esbuild/netbsd-x64 BINPATH=bin/esbuild platform-internal
400397

401-
platform-freebsd-x64:
402-
@$(MAKE) --no-print-directory GOOS=freebsd GOARCH=amd64 NPMDIR=npm/@esbuild/freebsd-x64 platform-unixlike
398+
platform-openbsd-arm64: version-go go-compiler
399+
@$(MAKE) --no-print-directory GOOS=openbsd GOARCH=arm64 NPMDIR=npm/@esbuild/openbsd-arm64 BINPATH=bin/esbuild platform-internal
403400

404-
platform-freebsd-arm64:
405-
@$(MAKE) --no-print-directory GOOS=freebsd GOARCH=arm64 NPMDIR=npm/@esbuild/freebsd-arm64 platform-unixlike
401+
platform-openbsd-x64: version-go go-compiler
402+
@$(MAKE) --no-print-directory GOOS=openbsd GOARCH=amd64 NPMDIR=npm/@esbuild/openbsd-x64 BINPATH=bin/esbuild platform-internal
406403

407-
platform-netbsd-arm64:
408-
@$(MAKE) --no-print-directory GOOS=netbsd GOARCH=arm64 NPMDIR=npm/@esbuild/netbsd-arm64 platform-unixlike
404+
platform-linux-x64: version-go go-compiler
405+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=amd64 NPMDIR=npm/@esbuild/linux-x64 BINPATH=bin/esbuild platform-internal
409406

410-
platform-netbsd-x64:
411-
@$(MAKE) --no-print-directory GOOS=netbsd GOARCH=amd64 NPMDIR=npm/@esbuild/netbsd-x64 platform-unixlike
407+
platform-linux-ia32: version-go go-compiler
408+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=386 NPMDIR=npm/@esbuild/linux-ia32 BINPATH=bin/esbuild platform-internal
412409

413-
platform-openbsd-arm64:
414-
@$(MAKE) --no-print-directory GOOS=openbsd GOARCH=arm64 NPMDIR=npm/@esbuild/openbsd-arm64 platform-unixlike
410+
platform-linux-arm: version-go go-compiler
411+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=arm NPMDIR=npm/@esbuild/linux-arm BINPATH=bin/esbuild platform-internal
415412

416-
platform-openbsd-x64:
417-
@$(MAKE) --no-print-directory GOOS=openbsd GOARCH=amd64 NPMDIR=npm/@esbuild/openbsd-x64 platform-unixlike
413+
platform-linux-arm64: version-go go-compiler
414+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=arm64 NPMDIR=npm/@esbuild/linux-arm64 BINPATH=bin/esbuild platform-internal
418415

419-
platform-linux-x64:
420-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=amd64 NPMDIR=npm/@esbuild/linux-x64 platform-unixlike
416+
platform-linux-loong64: version-go go-compiler
417+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=loong64 NPMDIR=npm/@esbuild/linux-loong64 BINPATH=bin/esbuild platform-internal
421418

422-
platform-linux-ia32:
423-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=386 NPMDIR=npm/@esbuild/linux-ia32 platform-unixlike
419+
platform-linux-mips64el: version-go go-compiler
420+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=mips64le NPMDIR=npm/@esbuild/linux-mips64el BINPATH=bin/esbuild platform-internal
424421

425-
platform-linux-arm:
426-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=arm NPMDIR=npm/@esbuild/linux-arm platform-unixlike
422+
platform-linux-ppc64: version-go go-compiler
423+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=ppc64le NPMDIR=npm/@esbuild/linux-ppc64 BINPATH=bin/esbuild platform-internal
427424

428-
platform-linux-arm64:
429-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=arm64 NPMDIR=npm/@esbuild/linux-arm64 platform-unixlike
425+
platform-linux-riscv64: version-go go-compiler
426+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=riscv64 NPMDIR=npm/@esbuild/linux-riscv64 BINPATH=bin/esbuild platform-internal
430427

431-
platform-linux-loong64:
432-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=loong64 NPMDIR=npm/@esbuild/linux-loong64 platform-unixlike
428+
platform-linux-s390x: version-go go-compiler
429+
@$(MAKE) --no-print-directory GOOS=linux GOARCH=s390x NPMDIR=npm/@esbuild/linux-s390x BINPATH=bin/esbuild platform-internal
433430

434-
platform-linux-mips64el:
435-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=mips64le NPMDIR=npm/@esbuild/linux-mips64el platform-unixlike
431+
platform-sunos-x64: version-go go-compiler
432+
@$(MAKE) --no-print-directory GOOS=illumos GOARCH=amd64 NPMDIR=npm/@esbuild/sunos-x64 BINPATH=bin/esbuild platform-internal
436433

437-
platform-linux-ppc64:
438-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=ppc64le NPMDIR=npm/@esbuild/linux-ppc64 platform-unixlike
439-
440-
platform-linux-riscv64:
441-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=riscv64 NPMDIR=npm/@esbuild/linux-riscv64 platform-unixlike
434+
platform-android-x64: platform-wasm
435+
@echo
436+
@echo "# Build: npm/@esbuild/android-x64"
437+
node scripts/esbuild.js npm/@esbuild/android-x64/package.json --version
442438

443-
platform-linux-s390x:
444-
@$(MAKE) --no-print-directory GOOS=linux GOARCH=s390x NPMDIR=npm/@esbuild/linux-s390x platform-unixlike
439+
platform-android-arm: platform-wasm
440+
@echo
441+
@echo "# Build: npm/@esbuild/android-x64"
442+
node scripts/esbuild.js npm/@esbuild/android-arm/package.json --version
445443

446-
platform-sunos-x64:
447-
@$(MAKE) --no-print-directory GOOS=illumos GOARCH=amd64 NPMDIR=npm/@esbuild/sunos-x64 platform-unixlike
444+
platform-openharmony-arm64: platform-wasm
445+
@echo
446+
@echo "# Build: npm/@esbuild/android-x64"
447+
node scripts/esbuild.js npm/@esbuild/openharmony-arm64/package.json --version
448448

449449
platform-wasm: esbuild go-compiler
450+
@echo
451+
@echo "# Build: npm/esbuild-wasm"
450452
node scripts/esbuild.js npm/esbuild-wasm/package.json --version
451453
$(GO_COMPILER) "$(NODE)" scripts/esbuild.js ./esbuild --wasm
452454
@shasum -a 256 npm/esbuild-wasm/esbuild.wasm
453455

454456
platform-neutral: esbuild
457+
@echo
458+
@echo "# Build: npm/esbuild"
455459
node scripts/esbuild.js npm/esbuild/package.json --version
456460
node scripts/esbuild.js ./esbuild --neutral
457461

458462
platform-deno: platform-wasm go-compiler
463+
@echo
464+
@echo "# Build: deno"
459465
$(GO_COMPILER) "$(NODE)" scripts/esbuild.js ./esbuild --deno
460466

461467
publish-all: check-go-version

0 commit comments

Comments
 (0)