Skip to content

Test libobjc2 v2.0 and v2.1 as well #167

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
Jun 13, 2022
Merged

Test libobjc2 v2.0 and v2.1 as well #167

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
5044aea
Test GNUStep libobjc2 v2.0 as well
madsmtm Jun 13, 2022
99b82ae
Fix linking to libobjc2 v2.0
madsmtm Jun 13, 2022
5d72415
Test GNUStep libobjc2 v2.1 as well
madsmtm Jun 13, 2022
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
42 changes: 33 additions & 9 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
os: macos-11
target: x86_64-apple-darwin
# Oldest macOS version we support
sdk: 10.7
sdk: "10.7"
- name: Test macOS nightly w. ui tests
os: macos-latest
target: x86_64-apple-darwin
Expand All @@ -73,17 +73,29 @@ jobs:
# binary, only build it
test-args: --no-run
# Newest SDK that supports 32-bit
sdk: 10.13
- name: Test GNUStep
sdk: "10.13"
- name: Test GNUStep with libobjc2 v1.9
os: ubuntu-latest
target: x86_64-unknown-linux-gnu
runtime: gnustep-1-9
libobjc2: "1.9"
- name: Test GNUStep with libobjc2 v2.0
os: ubuntu-latest
target: x86_64-unknown-linux-gnu
runtime: gnustep-2-0
libobjc2: "2.0"
- name: Test GNUStep with libobjc2 v2.1
os: ubuntu-latest
target: x86_64-unknown-linux-gnu
runtime: gnustep-2-1
libobjc2: "2.1"
- name: Test GNUStep 32bit
os: ubuntu-latest
target: i686-unknown-linux-gnu
cflags: -m32
configureflags: --target=x86-pc-linux-gnu
runtime: gnustep-1-9
libobjc2: "1.9"
- name: Test iOS simulator x86 64bit
os: macos-11
target: x86_64-apple-ios
Expand Down Expand Up @@ -234,13 +246,25 @@ jobs:
if: contains(matrix.runtime, 'gnustep') && steps.extern-cache.outputs.cache-hit != 'true'
run: sudo apt-get -y install make cmake

- name: Install GNUStep libobjc2 v1.9
if: contains(matrix.runtime, 'gnustep') && steps.extern-cache.outputs.cache-hit != 'true'
- name: Install GNUStep libobjc2
if: matrix.libobjc2 && steps.extern-cache.outputs.cache-hit != 'true'
run: |
wget https://github.com/gnustep/libobjc2/archive/refs/tags/v1.9.tar.gz
tar -xzf v1.9.tar.gz
mkdir -p libobjc2-1.9/build
cd libobjc2-1.9/build
wget https://github.com/gnustep/libobjc2/archive/refs/tags/v${{ matrix.libobjc2 }}.tar.gz
tar -xzf v${{ matrix.libobjc2 }}.tar.gz

# Install robin-map on v2.1
if test -d libobjc2-2.1; then
cd libobjc2-2.1/third_party
# Remove possibly existing `robin-map` folder
rm -rf robin-map
wget https://github.com/Tessil/robin-map/archive/757de829927489bee55ab02147484850c687b620.tar.gz
tar -xzf 757de829927489bee55ab02147484850c687b620.tar.gz
mv robin-map-757de829927489bee55ab02147484850c687b620 robin-map
cd ../..
fi

mkdir -p libobjc2-${{ matrix.libobjc2 }}/build
cd libobjc2-${{ matrix.libobjc2 }}/build
cmake -Wno-dev -DCMAKE_INSTALL_PREFIX=$HOME/extern -DTESTS=OFF ..
make install

Expand Down
10 changes: 8 additions & 2 deletions objc2/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,11 +178,17 @@ pub mod __gnustep_hack {
#[link(name = "gnustep-base", kind = "dylib")]
// This linking doesn't have to be on the correct `extern` block.
extern "C" {
static _OBJC_CLASS_NSObject: Class;
// The linking changed in libobjc2 v2.0
#[cfg_attr(feature = "gnustep-2-0", link_name = "._OBJC_CLASS_NSObject")]
#[cfg_attr(not(feature = "gnustep-2-0"), link_name = "_OBJC_CLASS_NSObject")]
static OBJC_CLASS_NSObject: Class;
// Others:
// __objc_class_name_NSObject
// _OBJC_CLASS_REF_NSObject
}

pub unsafe fn get_class_to_force_linkage() -> &'static Class {
unsafe { core::ptr::read_volatile(&&_OBJC_CLASS_NSObject) }
unsafe { core::ptr::read_volatile(&&OBJC_CLASS_NSObject) }
}

#[test]
Expand Down