@@ -11,6 +11,9 @@ XCPROJECT := Coder\ Desktop/Coder\ Desktop.xcodeproj
1111SCHEME := Coder\ Desktop
1212SWIFT_VERSION := 6.0
1313
14+ MUTAGEN_RESOURCES := mutagen-agents.tar.gz mutagen-darwin-arm64 mutagen-darwin-amd64
15+ MUTAGEN_VERSION := v0.18.1
16+
1417ifndef CURRENT_PROJECT_VERSION
1518 CURRENT_PROJECT_VERSION:=$(shell git describe --match 'v[0-9]*' --dirty='.devel' --always --tags)
1619endif
@@ -35,20 +38,11 @@ setup: \
3538 $(XCPROJECT ) \
3639 $(PROJECT ) /VPNLib/vpn.pb.swift \
3740 $(PROJECT ) /VPNLib/FileSync/daemon.pb.swift \
38- $(PROJECT ) /Resources/mutagen-agents.tar.gz \
39- $(PROJECT ) /Resources/mutagen-darwin-arm64 \
40- $(PROJECT ) /Resources/mutagen-darwin-amd64
41+ $(addprefix $(PROJECT ) /Resources/,$(MUTAGEN_RESOURCES ) )
4142
4243# Mutagen resources
43- $(PROJECT ) /Resources/mutagen-agents.tar.gz :
44- gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-agents.tar.gz " $@ "
45-
46- $(PROJECT ) /Resources/mutagen-darwin-arm64 :
47- gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-arm64 " $@ "
48- chmod +x " $@ "
49-
50- $(PROJECT ) /Resources/mutagen-darwin-amd64 :
51- gsutil cp gs://coder-desktop/mutagen/v0.18.1/mutagen-darwin-amd64 " $@ "
44+ $(addprefix $(PROJECT ) /Resources/,$(MUTAGEN_RESOURCES ) ) :
45+ gsutil cp " gs://coder-desktop/mutagen/$( MUTAGEN_VERSION) /$( subst Coder ,,$( notdir $@ ) ) " " $@ "
5246 chmod +x " $@ "
5347
5448$(XCPROJECT ) : $(PROJECT ) /project.yml
@@ -153,9 +147,7 @@ clean/build:
153147
154148.PHONY : clean/mutagen
155149clean/mutagen :
156- rm -f $(PROJECT ) /Resources/mutagen-agents.tar.gz
157- rm -f $(PROJECT ) /Resources/mutagen-darwin-arm64
158- rm -f $(PROJECT ) /Resources/mutagen-darwin-amd64
150+ find $(PROJECT ) /Resources -name ' mutagen-*' -delete
159151
160152.PHONY : proto
161153proto : $(PROJECT ) /VPNLib/vpn.pb.swift $(PROJECT ) /VPNLib/FileSync/daemon.pb.swift # # Generate Swift files from protobufs
0 commit comments