Skip to content

Upgrade to Bochs 2.8 #27

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 5 commits into from
Mar 15, 2024
Merged

Upgrade to Bochs 2.8 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f507e3
try to build with bochs 2.8
hugsy Mar 15, 2024
826cfee
test
hugsy Mar 15, 2024
27ceabd
test patch repos
hugsy Mar 15, 2024
d17503f
upped to v0.3.1 -> moved to bochs 2.8
hugsy Mar 15, 2024
6b6fcdd
back to using og repos
hugsy Mar 15, 2024
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
2 changes: 1 addition & 1 deletion .github/build-bochscpu.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir bxbuild
cd bxbuild

REM Use WSL to configure / clone the repositories.
bash -c "git clone https://github.com/yrp604/bochscpu-build.git && git clone https://github.com/hugsy/bochscpu.git && git clone https://github.com/yrp604/bochscpu-ffi.git && cd bochscpu-build && bash prep.sh && cd Bochs/bochs && bash .conf.cpu-msvc"
bash -c "git clone https://github.com/yrp604/bochscpu-build.git && git clone https://github.com/yrp604/bochscpu.git && git clone https://github.com/yrp604/bochscpu-ffi.git && cd bochscpu-build && bash prep.sh && cd Bochs/bochs && bash .conf.cpu-msvc"

REM Build bochs; libinstrument.a is expected to fail to build so don't freak out.
REM You can run nmake all-clean to clean up the build.
Expand Down
4 changes: 2 additions & 2 deletions .github/build-bochscpu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ mkdir bxbuild
cd bxbuild

git clone https://github.com/yrp604/bochscpu-build.git
git clone https://github.com/hugsy/bochscpu.git
git clone https://github.com/yrp604/bochscpu.git
git clone https://github.com/yrp604/bochscpu-ffi.git

cd bochscpu-build
bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU}|| true
bash prep.sh && cd Bochs/bochs && sh .conf.cpu && make -j ${NB_CPU} || true

# Remove old files in bochscpu.
rm -rf ../../../bochscpu/bochs
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ on:

env:
NB_CPU: 1
VERSION: '0.3'
VERSION: '0.3.1'
BOCHS_REV: REL_2_8_FINAL

jobs:
bochscpu:
env:
BOCHS_REV: 8dd9649389c813a189e3f702d58cdedb93730343
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -76,13 +75,13 @@ jobs:
uses: actions/upload-artifact@v4
with:
if-no-files-found: error
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }}
path: artifact

bindings:
needs: bochscpu
strategy:
fail-fast: false
fail-fast: true
matrix:
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
variant:
Expand All @@ -102,7 +101,7 @@ jobs:
uses: actions/download-artifact@v4
id: download_artifact
with:
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}
name: bochscpu-libs-${{ matrix.variant.os }}-${{ matrix.variant.arch }}-${{ env.BOCHS_REV }}
path: bochscpu-artifact

- name: Setup BochsCPU libs
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION True)
project(
bochscpu-python
LANGUAGES CXX
VERSION 0.3
VERSION 0.3.1
DESCRIPTION "Python bindings for BochsCPU"
HOMEPAGE_URL https://github.com/hugsy/bochscpu-python
)
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "scikit_build_core.build"

[project]
name = "bochscpu-python"
version = "0.3"
version = "0.3.1"
description = "Python bindings for BochsCPU."
readme = "./README.md"
license.file = "./LICENSE"
Expand Down
2 changes: 1 addition & 1 deletion python/src/bochscpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PyType_Slot slots[] = {
NB_MODULE(_bochscpu, m)
{
m.doc() = "The native `bochscpu` module";
m.attr("__version__") = "0.3";
m.attr("__version__") = "0.3.1";

//
// Submodules
Expand Down