[msvc] allow mozjs to be built using MSVC on windows #82

vvuk · 2016-06-22T20:53:55Z

This change is

Ms2ger · 2016-06-23T11:55:40Z

Seems like some of those should go upstream too.

vvuk · 2016-06-23T17:18:37Z

WinNSPR isn't upstream yet :(
JS_PUBLIC_API stuff should though.

metajack · 2016-07-14T21:16:21Z

Is WinNSPR something we made then? I don't understand.

@Ms2ger should sign off on this since he's in the middle of spidermonkey upgrade and these will need to be accounted for there too.

Build stuff looks fine to me.

Reviewed 6 of 7 files at r1, 1 of 1 files at r2.
Review status: all files reviewed at latest revision, 3 unresolved discussions.

build.rs, line 35 [r2] (raw file):

            println!("cargo:rustc-link-lib=stdc++");
        }
        //println!("cargo:rustc-link-lib=mozjs-48a1");

Can we remove this commented out line?

makefile.cargo, line 46 [r2] (raw file):

        # Visual Studio build
  OUT_DIR:=$(shell cygpath "$(OUT_DIR)")
  CONFIGURE_FLAGS += --target=x86_64-pc-mingw32

The target is not MSVC?

makefile.cargo, line 51 [r2] (raw file):

  MOZ_TOOLS=/

  ifneq (,$(wildcard c:/python27/python.exe))

Can we factor this into a branch for both windows targets so we aren't duplicating these lines?

Comments from Reviewable

Ms2ger · 2016-08-01T08:50:42Z

build.rs

+        let path = env::var_os("PATH").unwrap();
+        let mut paths = env::split_paths(&path).collect::<Vec<_>>();
+        paths.push(PathBuf::from(moztools));
+        let new_path = env::join_paths(paths).unwrap();


Can we use Iterator::chain instead?

Ms2ger · 2016-08-01T08:51:03Z

build.rs

+        if target.contains("gnu") {
+            println!("cargo:rustc-link-lib=stdc++");
+        }
+        //println!("cargo:rustc-link-lib=mozjs-48a1");


Ms2ger · 2016-08-01T08:51:45Z

build.rs

+        println!("cargo:rustc-link-lib=static=js_static");
+    } else {
+        println!("cargo:rustc-link-lib=stdc++");
+        println!("cargo:rustc-link-lib=static=js_static");


Let's move this back out of the if/else

Ms2ger · 2016-08-01T08:53:28Z

You'll need to update etc/patches


        Add support for doing MSVC compiler builds


        Don't include pthread.h on Windows in PosixNSPR.h


        Don't mix up struct/class in WinNSPR.cpp, as MSVC mangles them differ…

…ently


        When doing RUST_BINDGEN, we'll be using clang/llvm, and should use th…

…ose visibillity attributes


        Simplify makefile, and only touch/run configure if necessary


        Add patch files

vvuk · 2016-08-04T19:17:49Z

Review status: 2 of 8 files reviewed at latest revision, 3 unresolved discussions.

makefile.cargo, line 46 [r2] (raw file):

Previously, metajack (Jack Moffitt) wrote…

The target is not MSVC?

Not for gecko -- it uses the target as written and does internal stuff to figure out what compiler is being used. Gecko's build system is a mess, just nod and smile :|

makefile.cargo, line 51 [r2] (raw file):

Previously, metajack (Jack Moffitt) wrote…

Can we factor this into a branch for both windows targets so we aren't duplicating these lines?

Done

Comments from Reviewable

metajack · 2016-08-04T19:36:36Z

New changes look good to me. ms2ger, anything left you are waiting on?

Reviewed 1 of 5 files at r3, 2 of 2 files at r4, 3 of 3 files at r5.
Review status: all files reviewed at latest revision, 3 unresolved discussions.

Comments from Reviewable

vvuk · 2016-08-04T20:34:43Z

New changes look good to me. ms2ger, anything left you are waiting on?

I'm not sure how to make Iterator::chain happen btw, would be happy to if someone can guide me :)

Ms2ger · 2016-08-05T09:22:23Z

@bors-servo r=metajack

bors-servo · 2016-08-05T09:22:25Z

📌 Commit 59cb166 has been approved by metajack

bors-servo · 2016-08-05T09:22:26Z

⌛ Testing commit 59cb166 with merge ac9fcbe...


        Auto merge of #82 - vvuk:rust-msvc, r=metajack

[msvc] allow mozjs to be built using MSVC on windows  This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/mozjs/82)

larsbergstrom · 2016-08-05T14:59:54Z

Success: https://travis-ci.org/servo/mozjs/builds/150001941

vvuk force-pushed the vvuk:rust-msvc branch from 28dd1e6 to eaf5c83 Jul 12, 2016

vvuk force-pushed the vvuk:rust-msvc branch 6 times, most recently from bd54748 to d6325ad Jul 25, 2016

Ms2ger reviewed Aug 1, 2016
View changes

build.rs Outdated

if target.contains("gnu") {

println!("cargo:rustc-link-lib=stdc++");

}

//println!("cargo:rustc-link-lib=mozjs-48a1");

This comment has been minimized.

Sign in to view

Ms2ger Aug 1, 2016
Collaborator

Rm

Ms2ger reviewed Aug 1, 2016
View changes

vvuk added 6 commits Jul 21, 2016

Add support for doing MSVC compiler builds

b7c795d

Don't include pthread.h on Windows in PosixNSPR.h

8a85deb

Don't mix up struct/class in WinNSPR.cpp, as MSVC mangles them differ…

e01f3ce

…ently

When doing RUST_BINDGEN, we'll be using clang/llvm, and should use th…

8527e8e

…ose visibillity attributes

Simplify makefile, and only touch/run configure if necessary

3a85c69

Add patch files

Loading status checks…

59cb166

vvuk force-pushed the vvuk:rust-msvc branch from 8efbb36 to 59cb166 Aug 4, 2016

vvuk mentioned this pull request Aug 4, 2016

Allow [replace] to reference a github pull request rust-lang/cargo#2958

Closed

servo / mozjs

[msvc] allow mozjs to be built using MSVC on windows #82

[msvc] allow mozjs to be built using MSVC on windows #82

vvuk commented Jun 22, 2016 •

edited by larsbergstrom

Ms2ger commented Jun 23, 2016

vvuk commented Jun 23, 2016

metajack commented Jul 14, 2016

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Ms2ger commented Aug 1, 2016

vvuk commented Aug 4, 2016

metajack commented Aug 4, 2016

vvuk commented Aug 4, 2016

Ms2ger commented Aug 5, 2016

bors-servo commented Aug 5, 2016

bors-servo commented Aug 5, 2016

larsbergstrom commented Aug 5, 2016

servo / mozjs

Join GitHub today

[msvc] allow mozjs to be built using MSVC on windows #82

[msvc] allow mozjs to be built using MSVC on windows #82

Conversation

vvuk commented Jun 22, 2016 • edited by larsbergstrom

Ms2ger commented Jun 23, 2016

vvuk commented Jun 23, 2016

metajack commented Jul 14, 2016

This comment has been minimized.

Ms2ger Aug 1, 2016

This comment has been minimized.

Ms2ger Aug 1, 2016

This comment has been minimized.

Ms2ger Aug 1, 2016

Ms2ger commented Aug 1, 2016

vvuk commented Aug 4, 2016

metajack commented Aug 4, 2016

vvuk commented Aug 4, 2016

Ms2ger commented Aug 5, 2016

bors-servo commented Aug 5, 2016

bors-servo commented Aug 5, 2016

larsbergstrom commented Aug 5, 2016

vvuk commented Jun 22, 2016 •

edited by larsbergstrom