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.

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

Build macOS library on macOS, then copy it over for packaging #358

Merged
merged 1 commit into from
Oct 9, 2019

Conversation

badboy
Copy link
Member

@badboy badboy commented Oct 8, 2019

This ... is a bit hacky in that it needs to stop cargo/rust from
invoking the linker on Linux, which will fail. But if the "linker" just
doesn't do anything, the old file will remain and it will happily use it
in the packaging step.

There's a test release in my separate repository: https://github.com/badboy/glean-test-tc/releases/tag/v0.0.1-TESTING3

Here's a file listing of what's now in that forUnitTest jar:

.
├── META-INF
│   └── MANIFEST.MF
├── com
│   └── sun
│       └── jna
│           ├── aix-ppc
│           │   └── libjnidispatch.a
│           ├── aix-ppc64
│           │   └── libjnidispatch.a
│           ├── darwin
│           │   └── libjnidispatch.jnilib
│           ├── freebsd-x86
│           │   └── libjnidispatch.so
│           ├── freebsd-x86-64
│           │   └── libjnidispatch.so
│           ├── linux-aarch64
│           │   └── libjnidispatch.so
│           ├── linux-arm
│           │   └── libjnidispatch.so
│           ├── linux-armel
│           │   └── libjnidispatch.so
│           ├── linux-mips64el
│           │   └── libjnidispatch.so
│           ├── linux-ppc
│           │   └── libjnidispatch.so
│           ├── linux-ppc64le
│           │   └── libjnidispatch.so
│           ├── linux-s390x
│           │   └── libjnidispatch.so
│           ├── linux-x86
│           │   └── libjnidispatch.so
│           ├── linux-x86-64
│           │   └── libjnidispatch.so
│           ├── openbsd-x86
│           │   └── libjnidispatch.so
│           ├── openbsd-x86-64
│           │   └── libjnidispatch.so
│           ├── sunos-sparc
│           │   └── libjnidispatch.so
│           ├── sunos-sparcv9
│           │   └── libjnidispatch.so
│           ├── sunos-x86
│           │   └── libjnidispatch.so
│           ├── sunos-x86-64
│           │   └── libjnidispatch.so
│           ├── win32-x86
│           │   └── jnidispatch.dll
│           └── win32-x86-64
│               └── jnidispatch.dll
├── darwin
│   └── libglean_ffi.dylib
├── linux-x86-64
│   └── libglean_ffi.so
└── win32-x86-64
    └── glean_ffi.dll

Copy link
Contributor

@mdboom mdboom left a comment

Choose a reason for hiding this comment

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

Why no sunos builds of Glean?

@badboy
Copy link
Member Author

badboy commented Oct 8, 2019

Why no sunos builds of Glean?

Seriously, don't joke around lightly with these things.

- SmartOS (build: 20190731T235744Z)
[root@vm-host01 ~]# uname -a
SunOS vm-host01 5.11 joyent_20190731T235744Z i86pc i386 i86pc

@codecov-io
Copy link

codecov-io commented Oct 8, 2019

Codecov Report

Merging #358 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##             master    #358   +/-   ##
========================================
  Coverage      75.2%   75.2%           
  Complexity      307     307           
========================================
  Files            92      92           
  Lines          5182    5182           
  Branches        632     632           
========================================
  Hits           3897    3897           
  Misses          824     824           
  Partials        461     461

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 76a3be9...575938a. Read the comment docs.

Copy link
Contributor

@Dexterp37 Dexterp37 left a comment

Choose a reason for hiding this comment

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

r+ with optional nit :)

.circleci/config.yml Outdated Show resolved Hide resolved
This ... is a bit hacky in that it needs to stop cargo/rust from
invoking the linker on Linux, which will fail. But if the "linker" just
doesn't do anything, the old file will remain and it will happily use it
in the packaging step.
@badboy badboy merged commit ca83e30 into master Oct 9, 2019
@badboy badboy deleted the with-macos branch October 9, 2019 08:47
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.

None yet

5 participants