Skip to content

Commit addf437

Browse files
tesoneptesonep
committed
Merge branch 'master' into pharo-vm-unicorn2
2 parents cbf51e9 + 55b2950 commit addf437

File tree

226 files changed

+39894
-10299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+39894
-10299
lines changed

‎.github/workflows/Crate-publishing.yml‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,22 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
config:
28-
- {
29-
os: windows-latest,
28+
- {
29+
os: windows-2019,
3030
arch: x64,
3131
name: 'Windows x86_64'
3232
}
33-
- {
34-
os: windows-latest,
35-
arch: x32,
33+
- {
34+
os: windows-2019,
35+
arch: x86,
3636
name: 'Windows x86'
3737
}
38-
- {
38+
- {
3939
os: ubuntu-latest,
4040
arch: x64,
4141
name: 'Ubuntu x86_64'
4242
}
43-
- {
43+
- {
4444
os: macos-latest,
4545
arch: x64,
4646
name: 'macOS x86_64'
@@ -55,11 +55,11 @@ jobs:
5555
override: true
5656
default: true
5757

58-
- name: '🛠️ Add msbuild to PATH'
58+
- name: '🛠️ Activate Developer Command Prompt'
5959
if: contains(matrix.config.os, 'win')
60-
uses: microsoft/setup-msbuild@v1.0.3
60+
uses: ilammy/msvc-dev-cmd@v1
6161
with:
62-
vs-version: '16.5'
62+
arch: ${{ matrix.config.arch }}
6363

6464
- name: '🛠️ Win build dependencies'
6565
if: contains(matrix.config.os, 'win')
@@ -69,15 +69,13 @@ jobs:
6969
7070
- name: '🚧 Cargo test'
7171
if: "!startsWith(github.ref, 'refs/tags')"
72-
env:
73-
UNICORN_LOCAL: uc
7472
run: |
75-
cd bindings/rust && cargo test
76-
73+
cargo test
74+
7775
- name: '📦 Cargo Publish'
7876
if: startsWith(github.ref, 'refs/tags') && contains(matrix.config.os, 'ubuntu')
7977
env:
8078
TOKEN: ${{ secrets.cratesio_token }}
8179
UNICORN_VERSION: dev
8280
run: |
83-
cd bindings/rust && cargo login $TOKEN && cargo test && cargo publish
81+
cargo login $TOKEN && cargo test && cargo publish

‎.github/workflows/PyPI-publishing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ jobs:
2323
matrix:
2424
config:
2525
- {
26-
os: windows-latest,
26+
os: windows-2019,
2727
arch: x64,
2828
python-ver: '3.8',
2929
name: 'win_amd64'
3030
}
3131
- {
32-
os: windows-latest,
32+
os: windows-2019,
3333
arch: x32,
3434
python-ver: '3.8',
3535
name: 'win32'

‎.github/workflows/build-uc2.yml‎

Lines changed: 88 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
matrix:
2828
config:
2929
- {
30-
os: windows-latest,
30+
os: windows-2019,
3131
arch: x64,
3232
python-arch: x64,
3333
python-ver: '3.8',
@@ -40,7 +40,7 @@ jobs:
4040
generators: 'Ninja'
4141
}
4242
- {
43-
os: windows-latest,
43+
os: windows-2019,
4444
arch: x64,
4545
python-arch: x64,
4646
python-ver: '3.8',
@@ -53,25 +53,53 @@ jobs:
5353
generators: 'Ninja'
5454
}
5555
- {
56-
os: windows-latest,
56+
os: windows-2019,
5757
arch: x64,
5858
python-arch: x64,
5959
python-ver: '3.8',
60-
name: 'windows-x64 MSVC 64bit',
60+
name: 'windows-x64 MSVC 64bit shared',
6161
msvc-arch: x64,
62-
artifact: 'windows_msvc64.7z',
62+
artifact: 'windows_msvc64_shared.7z',
63+
shared: 'yes',
6364
build_type: 'Debug',
6465
archiver: '7z a',
6566
generators: 'Visual Studio 16 2019'
6667
}
6768
- {
68-
os: windows-latest,
69+
os: windows-2019,
6970
arch: x86,
7071
python-arch: x86,
7172
python-ver: '3.8',
72-
name: 'windows-x86 MSVC 32bit',
73+
name: 'windows-x86 MSVC 32bit shared',
7374
msvc-arch: x86,
74-
artifact: 'windows_msvc32.7z',
75+
artifact: 'windows_msvc32_shared.7z',
76+
shared: 'yes',
77+
build_type: 'Debug',
78+
archiver: '7z a',
79+
generators: 'Visual Studio 16 2019'
80+
}
81+
- {
82+
os: windows-2019,
83+
arch: x64,
84+
python-arch: x64,
85+
python-ver: '3.8',
86+
name: 'windows-x64 MSVC 64bit static',
87+
msvc-arch: x64,
88+
artifact: 'windows_msvc64_static.7z',
89+
shared: 'no',
90+
build_type: 'Debug',
91+
archiver: '7z a',
92+
generators: 'Visual Studio 16 2019'
93+
}
94+
- {
95+
os: windows-2019,
96+
arch: x86,
97+
python-arch: x86,
98+
python-ver: '3.8',
99+
name: 'windows-x86 MSVC 32bit static',
100+
msvc-arch: x86,
101+
artifact: 'windows_msvc32_static.7z',
102+
shared: 'no',
75103
build_type: 'Debug',
76104
archiver: '7z a',
77105
generators: 'Visual Studio 16 2019'
@@ -174,7 +202,7 @@ jobs:
174202
working-directory: instdir
175203
run: |
176204
ls -laR
177-
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} .
205+
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} . ../test*
178206
179207
- name: '📤 Upload artifact'
180208
if: always()
@@ -195,8 +223,21 @@ jobs:
195223
arch: x64,
196224
python-arch: x64,
197225
python-ver: '3.8',
198-
name: 'macos-x64 cmake',
199-
artifact: 'macos-cmake-x64.7z',
226+
name: 'macos-x64 cmake shared',
227+
shared: 'yes',
228+
artifact: 'macos-cmake-shared-x64.7z',
229+
build_type: 'Debug',
230+
archiver: '7za a',
231+
generators: 'Ninja'
232+
}
233+
- {
234+
os: macos-latest,
235+
arch: x64,
236+
python-arch: x64,
237+
python-ver: '3.8',
238+
name: 'macos-x64 cmake static',
239+
shared: 'no',
240+
artifact: 'macos-cmake-static-x64.7z',
200241
build_type: 'Debug',
201242
archiver: '7za a',
202243
generators: 'Ninja'
@@ -235,7 +276,8 @@ jobs:
235276
-B . \
236277
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
237278
-G "${{ matrix.config.generators }}" \
238-
-DCMAKE_INSTALL_PREFIX:PATH=instdir
279+
-DCMAKE_INSTALL_PREFIX:PATH=instdir \
280+
-DBUILD_SHARED_LIB= ${{ matrix.config.shared }}
239281
cmake --build . --config ${{ matrix.config.build_type }}
240282
cmake --install . --strip
241283
ctest -VV -C ${{ matrix.config.build_type }}
@@ -303,7 +345,7 @@ jobs:
303345
working-directory: instdir
304346
run: |
305347
ls -laR
306-
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} .
348+
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} . ../test*
307349
308350
- name: '📤 Upload artifact'
309351
if: always()
@@ -324,8 +366,9 @@ jobs:
324366
arch: x64,
325367
python-arch: x64,
326368
python-ver: '3.8',
327-
name: 'ubuntu-x64 cmake',
328-
artifact: 'ubuntu-cmake-x64.7z',
369+
name: 'ubuntu-x64 cmake shared',
370+
shared: 'yes',
371+
artifact: 'ubuntu-cmake-shared-x64.7z',
329372
build_type: 'Debug',
330373
archiver: '7z a',
331374
generators: 'Ninja'
@@ -335,8 +378,33 @@ jobs:
335378
arch: x86,
336379
python-arch: x86,
337380
python-ver: '3.8',
338-
name: 'ubuntu-x86 cmake',
339-
artifact: 'ubuntu-cmake-x86.7z',
381+
name: 'ubuntu-x86 cmake shared',
382+
shared: 'yes',
383+
artifact: 'ubuntu-cmake-shared-x86.7z',
384+
build_type: 'Debug',
385+
archiver: '7z a',
386+
generators: 'Ninja'
387+
}
388+
- {
389+
os: ubuntu-latest,
390+
arch: x64,
391+
python-arch: x64,
392+
python-ver: '3.8',
393+
name: 'ubuntu-x64 cmake static',
394+
shared: 'no',
395+
artifact: 'ubuntu-cmake-static-x64.7z',
396+
build_type: 'Debug',
397+
archiver: '7z a',
398+
generators: 'Ninja'
399+
}
400+
- {
401+
os: ubuntu-latest,
402+
arch: x86,
403+
python-arch: x86,
404+
python-ver: '3.8',
405+
name: 'ubuntu-x86 cmake static',
406+
shared: 'no',
407+
artifact: 'ubuntu-cmake-static-x86.7z',
340408
build_type: 'Debug',
341409
archiver: '7z a',
342410
generators: 'Ninja'
@@ -393,7 +461,8 @@ jobs:
393461
-B . \
394462
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
395463
-G "${{ matrix.config.generators }}" \
396-
-DCMAKE_INSTALL_PREFIX:PATH=instdir
464+
-DCMAKE_INSTALL_PREFIX:PATH=instdir \
465+
-DBUILD_SHARED_LIBS=${{ matrix.config.shared }}
397466
cmake --build . --config ${{ matrix.config.build_type }}
398467
cmake --install . --strip
399468
ctest -VV -C ${{ matrix.config.build_type }}
@@ -430,7 +499,7 @@ jobs:
430499
working-directory: instdir
431500
run: |
432501
ls -laR
433-
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} .
502+
${{ matrix.config.archiver }} ../${{ matrix.config.artifact }} . ../test*
434503
435504
- name: '📤 Upload artifact'
436505
if: always()

‎.github/workflows/stale.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 5 * * *'
5+
workflow_dispatch:
6+
7+
jobs:
8+
stale:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/stale@v4
12+
with:
13+
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 15 days.'
14+
days-before-stale: 60
15+
days-before-close: 15
16+
exempt-all-milestones: true
17+
exempt-issue-labels: 'pinned'
18+
exempt-pr-labels: 'pinned'

‎.gitignore‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,7 @@
1212
*.jar
1313
*~
1414

15-
qemu/aarch64-softmmu/
16-
qemu/aarch64eb-softmmu/
17-
qemu/arm-softmmu/
18-
qemu/armeb-softmmu/
19-
qemu/m68k-softmmu/
20-
qemu/mips64el-softmmu/
21-
qemu/mips64-softmmu/
22-
qemu/mipsel-softmmu/
23-
qemu/mips-softmmu/
24-
qemu/sparc64-softmmu/
25-
qemu/sparc-softmmu/
26-
qemu/i386-softmmu/
27-
qemu/x86_64-softmmu/
28-
qemu/ppc-softmmu/
29-
qemu/ppc64-softmmu/
30-
qemu/riscv32-softmmu/
31-
qemu/riscv64-softmmu/
15+
qemu/*-softmmu/
3216

3317
tags
3418
qemu/config-host.ld
@@ -68,8 +52,8 @@ bindings/python/unicorn.egg-info/
6852
bindings/python/unicorn/lib/
6953
bindings/python/unicorn/include/
7054
bindings/python/MANIFEST
71-
bindings/rust/target/
72-
bindings/rust/Cargo.lock
55+
target/
56+
Cargo.lock
7357
config.log
7458

7559

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "docs/Unicorn_Engine_Documentation"]
22
path = docs/Unicorn_Engine_Documentation
3-
url = git@github.com:kabeor/Unicorn-Engine-Documentation
3+
url = https://github.com/kabeor/Unicorn-Engine-Documentation

0 commit comments

Comments
 (0)