Skip to content

Commit f9851f1

Browse files
msimacekmsimacek
committed
[GR-65687][GR-65581] Extract libraries based on wheel records
PullRequest: graalpython/3832
2 parents d50f75c + efc8e57 commit f9851f1

File tree

34 files changed

+428
-183
lines changed

34 files changed

+428
-183
lines changed

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/fileslist.txt

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
/GRAALPY-VFS/com.oracle.graal.python.test/integration/file1
77
/GRAALPY-VFS/com.oracle.graal.python.test/integration/extractme
88
/GRAALPY-VFS/com.oracle.graal.python.test/integration/SomeFile
9-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/
10-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg/
11-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg/file.tso
12-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/
13-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/file1.tso
14-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/file2.tso
15-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/
16-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/file1.tso
17-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/file2.tso
18-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/nofilterfile
19-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/dir/
20-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/dir/file1.tso
21-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/dir/file2.tso
22-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg-nolibs/
23-
/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg-nolibs/file.tso
9+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/
10+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.libs/
11+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.libs/fake-dependency2.so.2
12+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.libs/fake-dependency1.so
13+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.dist-info/
14+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.dist-info/RECORD
15+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/pkg1/
16+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/pkg1/__init__.py
17+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/pkg1/pkg1-fake-library.so
18+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.libs/
19+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.libs/not-extracted.so
20+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.dist-info/
21+
/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.dist-info/RECORD

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.dist-info/RECORD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
pkg1/__init__.py,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
2+
pkg1/pkg1-fake-library.so,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
3+
package1.libs/fake-dependency1.so,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0
4+
package1.libs/fake-dependency2.so.2,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg-nolibs/file.tso renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.libs/fake-dependency1.so

File renamed without changes.

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/dir/file1.tso renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package1.libs/fake-dependency2.so.2

File renamed without changes.

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.dist-info/RECORD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package2.libs/not-extracted.so,sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855,0

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/dir/file2.tso renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/package2.libs/not-extracted.so

File renamed without changes.

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/file1.tso renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/pkg1/__init__.py

File renamed without changes.

‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/site-packages/testpkg.libs/dir/file2.tso renamed to ‎graalpython/com.oracle.graal.python.test.integration/src/GRAALPY-VFS/com.oracle.graal.python.test/integration/src/pkg1/pkg1-fake-library.so

File renamed without changes.

‎graalpython/com.oracle.graal.python.test.integration/src/org.graalvm.python.vfs/fileslist.txt

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,16 @@
66
/org.graalvm.python.vfs/file1
77
/org.graalvm.python.vfs/extractme
88
/org.graalvm.python.vfs/SomeFile
9-
/org.graalvm.python.vfs/site-packages/
10-
/org.graalvm.python.vfs/site-packages/testpkg/
11-
/org.graalvm.python.vfs/site-packages/testpkg/file.tso
12-
/org.graalvm.python.vfs/site-packages/testpkg.libs/
13-
/org.graalvm.python.vfs/site-packages/testpkg.libs/file1.tso
14-
/org.graalvm.python.vfs/site-packages/testpkg.libs/file2.tso
15-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/
16-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/file1.tso
17-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/file2.tso
18-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/nofilterfile
19-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/dir/
20-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/dir/file1.tso
21-
/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/dir/file2.tso
22-
/org.graalvm.python.vfs/site-packages/testpkg-nolibs/
23-
/org.graalvm.python.vfs/site-packages/testpkg-nolibs/file.tso
9+
/org.graalvm.python.vfs/src/
10+
/org.graalvm.python.vfs/src/package1.libs/
11+
/org.graalvm.python.vfs/src/package1.libs/fake-dependency2.so.2
12+
/org.graalvm.python.vfs/src/package1.libs/fake-dependency1.so
13+
/org.graalvm.python.vfs/src/package1.dist-info/
14+
/org.graalvm.python.vfs/src/package1.dist-info/RECORD
15+
/org.graalvm.python.vfs/src/pkg1/
16+
/org.graalvm.python.vfs/src/pkg1/__init__.py
17+
/org.graalvm.python.vfs/src/pkg1/pkg1-fake-library.so
18+
/org.graalvm.python.vfs/src/package2.libs/
19+
/org.graalvm.python.vfs/src/package2.libs/not-extracted.so
20+
/org.graalvm.python.vfs/src/package2.dist-info/
21+
/org.graalvm.python.vfs/src/package2.dist-info/RECORD

‎graalpython/com.oracle.graal.python.test.integration/src/org.graalvm.python.vfs/site-packages/testpkg.libs/dir/dir/file1.tso

Whitespace-only changes.

0 commit comments

Comments
 (0)