Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Windows support #38

Merged
merged 29 commits into from
Oct 13, 2021
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
77cf4ee
feat: root makefile windows support
josh-audio Oct 5, 2021
b882822
feat: fall back to flutter pub if pub is missing
josh-audio Oct 5, 2021
ac06693
fix: broken pub finder
josh-audio Oct 5, 2021
2b7f0a7
feat: make sub tests cross-platform until rid-build
josh-audio Oct 5, 2021
8f24cf6
chore: refactor Makefile.variable
Oct 5, 2021
be2cb07
fix: set test variable without space on Windows
Oct 5, 2021
5c1839d
fix: address review comments
josh-audio Oct 6, 2021
ca766b6
Merge branch 'fix/local-test-failure' into feat/windows-support
josh-audio Oct 6, 2021
8faf38b
fix: prefer dart pub
josh-audio Oct 6, 2021
e63334c
fix: hack - run dart under powershell on Windows
josh-audio Oct 6, 2021
8e955fa
revert: dart pub does not need to be preferred over flutter pub
Oct 6, 2021
4f02665
fix: run pub as explicit make step
Oct 6, 2021
b80266c
feat: fall back to dart pub flutter pub not found
Oct 6, 2021
ea5024a
fix: Windows DLLs don't have lib prefix
Oct 6, 2021
349d8cd
feat: functioning `make test` on Windows
Oct 6, 2021
1cba612
Merge remote-tracking branch 'upstream/master' into feat/windows-support
Oct 6, 2021
68d796b
fix: prevent staleness by always running pub get
josh-audio Oct 6, 2021
63495a9
fix: lib_name uses crate_name when not in test
josh-audio Oct 6, 2021
3d2c1e6
feat: add Windows test action
josh-audio Oct 7, 2021
eb57c04
Merge remote-tracking branch 'origin/master' into feat/windows-support
josh-audio Oct 7, 2021
9b5c300
feat: flutter template Windows support
josh-audio Oct 8, 2021
222ba85
feat: unify build+test step and add macOS support
josh-audio Oct 10, 2021
c90f8f5
fix: use correct matrix values
josh-audio Oct 10, 2021
eab991a
fix: add LLVM step for Ubuntu
josh-audio Oct 10, 2021
a6e32ed
fix: only run LLVM install step on Ubuntu
josh-audio Oct 10, 2021
f43a4bd
fix: rustfmt parse failure
josh-audio Oct 11, 2021
0157d72
chore: cargo fmt
josh-audio Oct 11, 2021
c665650
revert: undo f43a4bd
josh-audio Oct 12, 2021
b38b554
chore: `pub` -> `dart pub`
josh-audio Oct 13, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: fall back to flutter pub if pub is missing
josh-audio authored and Joshua Wade committed Oct 5, 2021
commit b8828222659dc172426afcf4d289a26587469181
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ROOT:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
include ./Makefile.variable

test: test_rust test_integration

22 changes: 22 additions & 0 deletions Makefile.variable
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
ROOT:=$(dir $(realpath $(lastword $(MAKEFILE_LIST))))

# If pub isn't in the path but flutter is, set "flutter" to PUB_PREFIX
ERR_PUB_NOT_FOUND := "Flutter could not found in path. Please install Flutter and try again."

ifeq ($(OS),Windows_NT)
ifeq (, $(shell which pub))
ifeq (, $(shell which flutter))
PUB_PREFIX := flutter
else
$(error $(ERR_PUB_NOT_FOUND))
endif
endif
else
ifeq (, $(shell where pub 2>NUL))
ifeq (, $(shell where flutter 2>NUL))
PUB_PREFIX := flutter
else
$(error $(ERR_PUB_NOT_FOUND))
endif
endif
endif
4 changes: 3 additions & 1 deletion tests/dart/apps/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include ../../../Makefile.variable

test-all:
$(MAKE) test TEST=todo

@@ -10,6 +12,6 @@ expand:
cargo expand --example $(TEST)

./.dart_tool/:
pub get
$(PUB_PREFIX) pub get

.PHONY: test-all test expand
4 changes: 3 additions & 1 deletion tests/dart/export/Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
include ../../../Makefile.variable

test-all:
$(MAKE) test TEST=primitives
$(MAKE) test TEST=strings
@@ -15,6 +17,6 @@ expand:
@cargo expand --example $(TEST)

./.dart_tool/:
pub get
$(PUB_PREFIX) pub get

.PHONY: test-all test expand
6 changes: 4 additions & 2 deletions tests/dart/field_access/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
test-all:
include ../../../Makefile.variable

test-all:
$(MAKE) test TEST=strings
$(MAKE) test TEST=primitives
$(MAKE) test TEST=structs
@@ -15,6 +17,6 @@ expand:
@cargo expand --example $(TEST)

./.dart_tool/:
pub get
$(PUB_PREFIX) pub get

.PHONY: test-all test expand
6 changes: 4 additions & 2 deletions tests/dart/framework/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
test-all:
include ../../../Makefile.variable

test-all:
$(MAKE) test TEST=messaging

test: ./.dart_tool/
@@ -10,6 +12,6 @@ expand:
@cargo expand --example $(TEST)

./.dart_tool/:
pub get
$(PUB_PREFIX) pub get

.PHONY: test-all test expand