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.

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

Jump to bottom

Build zeroMq v5 on Electron 9 - Windows #445

Merged
merged 3 commits into from
Apr 14, 2021
Merged

Build zeroMq v5 on Electron 9 - Windows #445

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
a45ba33
Build zeroMq v5 on modern Windows
aminya Apr 14, 2021
ccd4d3f
Target 10.15 (Catalina) on MacOS
aminya Apr 14, 2021
58d5f01
Update Nan patch releases
aminya Apr 14, 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
3 changes: 1 addition & 2 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
}, {
'conditions': [
['OS=="win"', {
'msbuild_toolset': 'v140',
'defines': ['ZMQ_STATIC'],
captainsafia marked this conversation as resolved.
Show resolved Hide resolved
'include_dirs': ['windows/include'],
'libraries': [
Expand All @@ -29,7 +28,7 @@
['OS=="mac" or OS=="solaris"', {
'xcode_settings': {
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'MACOSX_DEPLOYMENT_TARGET': '10.9',
'MACOSX_DEPLOYMENT_TARGET': '10.15',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for bumping this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not on Mac myself but I've been using this target in Zadeh, and I haven't had any complaints from the users. If we could remove this variable and let Node-gyp handle it for us, it would be awesome.

https://github.com/atom-community/zadeh/blob/0a5ca9a129fdfd947fa4c697dfdbbdc36dbd721f/binding.gyp#L26

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try this locally on my Mac to confirm. Might as well dust off the old zeromq.js set up as well.

},
'libraries': ['<(PRODUCT_DIR)/../../zmq/lib/libzmq.a'],
'include_dirs': ['<(PRODUCT_DIR)/../../zmq/include'],
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"url": "https://github.com/zeromq/zeromq.js.git"
},
"dependencies": {
"nan": "^2.14.0",
"prebuild-install": "^5.3.2"
"nan": "^2.14.2",
"prebuild-install": "^6.1.1"
},
"devDependencies": {
"electron-mocha": "^6.0.0",
"jsdoc": "^3.5.4",
"mocha": "^5.0.0",
"nyc": "^12.0.2",
"prebuild": "^9.1.1",
"prebuild": "^10.0.1",
"semver": "^5.4.1",
"should": "^13.0.0"
},
Expand Down