Skip to content

Fix esr128 windows artifact & MOZJS_ARCHIVE #483

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 29, 2024
Merged

Fix esr128 windows artifact & MOZJS_ARCHIVE #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
660c1c2
Do not strip windows archive
sagudev Jul 29, 2024
bb182fc
Fix `MOZJS_ARCHIVE` to match readme
sagudev Jul 29, 2024
7d60422
Bup mozjs-sys version
sagudev Jul 29, 2024
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ this feature:
path, extract it, and then link against the static libraries included in the archive.
- `MOZJS_ARCHIVE=https://url/to/release/page`: This option will download the archive from
the provided base URL, extract it, and then link against the static libraries included in the
archive. The base URL should be similar to `https://github.com/servo/mozjs/releases/`.
archive. The base URL should be similar to `https://github.com/servo/mozjs/releases`.
The build script will append the version and target accordingly. See the files at the example
URL for more details.

Expand Down
2 changes: 1 addition & 1 deletion mozjs-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "mozjs_sys"
description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
repository.workspace = true
version = "0.128.0-0"
version = "0.128.0-1"
authors = ["Mozilla"]
links = "mozjs"
build = "build.rs"
Expand Down
11 changes: 2 additions & 9 deletions mozjs-sys/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -823,13 +823,6 @@ fn compress_static_lib(build_dir: &Path) -> Result<(), std::io::Error> {
let mut tar = tar::Builder::new(enc);

if target.contains("windows") {
let status = Command::new("llvm-strip.exe")
.arg("--strip-debug")
.arg(build_dir.join("js/src/build/js_static.lib"))
.status()
.unwrap();
assert!(status.success());

// This is the static library of spidermonkey.
tar.append_file(
"js/src/build/js_static.lib",
Expand Down Expand Up @@ -910,7 +903,7 @@ fn decompress_static_lib(archive: &Path, build_dir: &Path) -> Result<(), std::io
/// Download the SpiderMonkey archive with cURL using the provided base URL. If it's None,
/// it will use `servo/mozjs`'s release page as the base URL.
fn download_archive(base: Option<&str>) -> Result<PathBuf, std::io::Error> {
let base = base.unwrap_or("https://github.com/servo/mozjs/releases/download");
let base = base.unwrap_or("https://github.com/servo/mozjs/releases");
let version = env::var("CARGO_PKG_VERSION").unwrap();
let target = env::var("TARGET").unwrap();
let archive_path = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("libmozjs.tar.gz");
Expand All @@ -922,7 +915,7 @@ fn download_archive(base: Option<&str>) -> Result<PathBuf, std::io::Error> {
.arg("-o")
.arg(&archive_path)
.arg(format!(
"{base}/mozjs-sys-v{version}/libmozjs-{target}.tar.gz"
"{base}/download/mozjs-sys-v{version}/libmozjs-{target}.tar.gz"
))
.status()?
.success()
Expand Down