Skip to content

Commit 34033a2

Browse files
committed
skip loading dynamic library for j4rs
1 parent b6fdc29 commit 34033a2

File tree

4 files changed

+5
-13
lines changed

4 files changed

+5
-13
lines changed

.github/workflows/release.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ jobs:
5757

5858
- name: Copy j4rs dependencies into dist
5959
run: |
60-
mkdir -p connectorx-python/connectorx/dependencies/deps
6160
cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
62-
cp -f connectorx-python/target/release/deps/libj4rs*.so connectorx-python/connectorx/dependencies/deps
6361
6462
# rebuild the wheel to incorporate j4rs dependencies
6563
- uses: messense/maturin-action@v1
@@ -83,7 +81,7 @@ jobs:
8381
name: "ubuntu-latest-${{ matrix.python-version[1] }}"
8482
path: connectorx-python/target/wheels/*.whl
8583

86-
mac-and-win:
84+
win-and-mac:
8785
runs-on: ${{ matrix.os }}
8886
strategy:
8987
matrix:
@@ -129,9 +127,7 @@ jobs:
129127

130128
- name: Copy j4rs dependencies into dist
131129
run: |
132-
mkdir -p connectorx-python/connectorx/dependencies/deps
133-
cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
134-
cp -f connectorx-python/target/release/deps/libj4rs*.{dylib,dll} connectorx-python/connectorx/dependencies/deps 2>/dev/null || :
130+
cp -r connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
135131
136132
# rebuild the wheel to incorporate j4rs dependencies
137133
- uses: messense/maturin-action@v1
@@ -192,9 +188,7 @@ jobs:
192188

193189
- name: Copy j4rs dependencies into dist
194190
run: |
195-
mkdir -p connectorx-python/connectorx/dependencies/deps
196-
cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
197-
cp -f connectorx-python/target/release/deps/libj4rs*.dylib connectorx-python/connectorx/dependencies/deps
191+
cp -rf connectorx-python/target/aarch64-apple-darwin/release/jassets connectorx-python/connectorx/dependencies
198192
199193
# rebuild the wheel to incorporate j4rs dependencies
200194
- uses: messense/maturin-action@v1
@@ -212,7 +206,7 @@ jobs:
212206

213207
verify:
214208
runs-on: ${{ matrix.os }}
215-
needs: [mac-and-win, linux, apple-arm]
209+
needs: [win-and-mac, linux, apple-arm]
216210
strategy:
217211
matrix:
218212
python-version: ["3.7", "3.8", "3.9", "3.10"]

Justfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ build-python-wheel:
101101
# need to get the j4rs dependency first
102102
cd connectorx-python && maturin build --release -i python --no-sdist
103103
# copy files
104-
mkdir -p connectorx-python/connectorx/dependencies/deps
105104
cp -rf connectorx-python/target/release/jassets connectorx-python/connectorx/dependencies
106-
cp -f connectorx-python/target/release/deps/libj4rs*.{dylib,so,dll} connectorx-python/connectorx/dependencies/deps 2>/dev/null || :
107105
cp README.md connectorx-python/README.md
108106
cp LICENSE connectorx-python/LICENSE
109107
# build final wheel

connectorx-python/connectorx/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
not os.path.basename(os.path.abspath(os.path.join(dir_path, "..")))
2828
== "connectorx-python"
2929
):
30-
print("haha", dir_path, "lala", os.path.basename(os.path.join(dir_path, "..")))
3130
if "J4RS_BASE_PATH" not in os.environ:
3231
os.environ["J4RS_BASE_PATH"] = os.path.join(dir_path, "dependencies")
3332
if "CX_REWRITER_PATH" not in os.environ:

connectorx/src/fed_dispatcher.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ fn init_jvm(j4rs_base: Option<&str>) -> Jvm {
4343

4444
let entry = ClasspathEntry::new(path.to_str().unwrap());
4545
JvmBuilder::new()
46+
.skip_setting_native_lib()
4647
.classpath_entry(entry)
4748
.with_base_path(base.to_str().unwrap())
4849
.build()?

0 commit comments

Comments
 (0)