Skip to content

Conversation

lgeiger
Copy link
Member

@lgeiger lgeiger commented Sep 15, 2016

I added a static compiled version of zmq v4.1.5. It is linked (statically) in the .gyp file. I went ahead and also removed the DLL stuff inside the bindings.cc file.

The prebuilts will have a size of approx. 230 kB.
So this time I'm quite confident that the'll work though I didn't know how to test this without a release.

@rgbkrk
Copy link
Member

rgbkrk commented Sep 16, 2016

Woo!

@lgeiger
Copy link
Member Author

lgeiger commented Sep 16, 2016

Looks like I broke the linux build

'libraries': [ '<(PRODUCT_DIR)/../../zmq/lib/libzmq.a' ],
}],
]
}
Copy link
Member

Choose a reason for hiding this comment

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

Wow you really went to town here. 👀

binding.gyp Outdated
}],
['OS=="linux"', {
'libraries': [ '<(PRODUCT_DIR)/../../zmq/lib/libzmq.a' ],
'libraries': [ '<(PRODUCT_DIR)/../../zmq/lib/libzmq.a' ],
Copy link
Member

@rgbkrk rgbkrk Sep 16, 2016

Choose a reason for hiding this comment

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

This looks like a duplicate that needs to be deleted.

Either that or you meant to bring in the include_dirs that you introduced in OS X + Solaris.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yup fix is on the way

#define ZMQ_VERSION_MINOR 0
#define ZMQ_VERSION_PATCH 4
#define ZMQ_VERSION_MINOR 1
#define ZMQ_VERSION_PATCH 5
Copy link
Member

Choose a reason for hiding this comment

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

👍

Copy link
Member Author

Choose a reason for hiding this comment

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

These are the headers from the official release

#endif

#endif
/* This file is deprecated, and all its functionality provided by zmq.h */
Copy link
Member

Choose a reason for hiding this comment

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

👍

@lgeiger
Copy link
Member Author

lgeiger commented Sep 16, 2016

CI is happy 💚

binding.gyp Outdated
'conditions': [
['OS=="win"', {
'win_delay_load_hook': 'true',
'msbuild_toolset': 'v120',
Copy link
Member Author

Choose a reason for hiding this comment

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

Before you merge. I'll try to remove this line to see what appveyor does.

Copy link
Member

Choose a reason for hiding this comment

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

ok sure

Copy link
Member

Choose a reason for hiding this comment

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

good thing the github ui is responsive because I was about to merge this now!

Copy link
Member Author

@lgeiger lgeiger Sep 16, 2016

Choose a reason for hiding this comment

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

I'll add it again. Looks like it's necessary.

@lgeiger
Copy link
Member Author

lgeiger commented Sep 16, 2016

Everything good to go 🚀 📦

@rgbkrk rgbkrk merged commit 59bea2c into zeromq:master Sep 16, 2016
@lgeiger lgeiger deleted the windows branch September 16, 2016 00:40
@rgbkrk
Copy link
Member

rgbkrk commented Sep 16, 2016

Cool, let's :shipit:.

@lgeiger
Copy link
Member Author

lgeiger commented Sep 16, 2016

Great I'll push a tag.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants