Merge pull request #810 from veryl-lang/sourcemap_resolver

Add sourcemap-resolver to release build
veryl-lang · Jul 3, 2024 · 20bdd33 · 20bdd33
2 parents 4ae5546 + 6602622
commit 20bdd33
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,6 +11,9 @@ members = [
     "crates/tests",
     "crates/veryl",
 ]
+exclude = [
+    "support/sourcemap-resolver",
+]
 resolver = "2"
 
 [workspace.package]

diff --git a/Makefile b/Makefile
@@ -25,18 +25,26 @@ lint:
 
 release_lnx:
 	cargo build --locked --release --target=x86_64-unknown-linux-musl $(addprefix --bin , ${BIN_NAMES})
-	zip -j ${ZIP_NAME}-x86_64-linux.zip $(addprefix target/x86_64-unknown-linux-musl/release/, ${BIN_NAMES})
+	cd ./support/sourcemap-resolver; cargo build --locked --release --target=x86_64-unknown-linux-musl
+	zip -j ${ZIP_NAME}-x86_64-linux.zip $(addprefix target/x86_64-unknown-linux-musl/release/, ${BIN_NAMES}) \
+		                                ./support/sourcemap-resolver/target/x86_64-unknown-linux-musl/release/sourcemap-resolver
 
 release_win:
 	cargo build --locked --release --target=x86_64-pc-windows-msvc $(addprefix --bin , ${BIN_NAMES})
+	cd ./support/sourcemap-resolver; cargo build --locked --release --target=x86_64-pc-windows-msvc
 	mv -v $(addsuffix .exe, $(addprefix target/x86_64-pc-windows-msvc/release/, ${BIN_NAMES})) ./
-	7z a ${ZIP_NAME}-x86_64-windows.zip $(addsuffix .exe, ${BIN_NAMES})
+	mv -v ./support/sourcemap-resolver/target/x86_64-pc-windows-msvc/release/sourcemap-resolver.exe ./
+	7z a ${ZIP_NAME}-x86_64-windows.zip $(addsuffix .exe, ${BIN_NAMES}) sourcemap-resolver.exe
 
 release_mac:
 	cargo build --locked --release --target=x86_64-apple-darwin $(addprefix --bin , ${BIN_NAMES})
 	cargo build --locked --release --target=aarch64-apple-darwin $(addprefix --bin , ${BIN_NAMES})
-	zip -j ${ZIP_NAME}-x86_64-mac.zip $(addprefix target/x86_64-apple-darwin/release/, ${BIN_NAMES})
-	zip -j ${ZIP_NAME}-aarch64-mac.zip $(addprefix target/aarch64-apple-darwin/release/, ${BIN_NAMES})
+	cd ./support/sourcemap-resolver; cargo build --locked --release --target=x86_64-apple-darwin
+	cd ./support/sourcemap-resolver; cargo build --locked --release --target=aarch64-apple-darwin
+	zip -j ${ZIP_NAME}-x86_64-mac.zip $(addprefix target/x86_64-apple-darwin/release/, ${BIN_NAMES}) \
+		                              ./support/sourcemap-resolver/target/x86_64-apple-darwin/release/sourcemap-resolver
+	zip -j ${ZIP_NAME}-aarch64-mac.zip $(addprefix target/aarch64-apple-darwin/release/, ${BIN_NAMES}) \
+		                               ./support/sourcemap-resolver/target/aarch64-apple-darwin/release/sourcemap-resolver
 
 release_rpm:
 	mkdir -p target