Skip to content
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

Jump to bottom

Port project to CMake #92

Merged
merged 16 commits into from
Dec 28, 2023
Merged

Port project to CMake #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d5b518c
Convert project to cmake/cmkr
ZehMatt Sep 21, 2023
2afdb06
Remove old project files and remove local zydis build
ZehMatt Sep 21, 2023
396a6d8
Remove WinForms, should use NuGet for this, more fixes
ZehMatt Sep 22, 2023
6241a01
Remove asmjit, restructure resources
ZehMatt Sep 22, 2023
ec696d9
Use individual files for resources, load them at startup
ZehMatt Sep 22, 2023
ca53880
Start fixing broken code due to WinForms not existing anymore
ZehMatt Sep 22, 2023
4106462
Start of cleanup
ZehMatt Oct 2, 2023
88d9547
Attempt to fix CI
ZehMatt Oct 2, 2023
75d5b31
Add missing file
ZehMatt Oct 2, 2023
e0dd924
Fix tests, use delayed load of x64dbg dependencies
ZehMatt Oct 2, 2023
a2606e8
Restructure tests, adjust CI script
ZehMatt Oct 2, 2023
25a8517
Fix About dialog
ZehMatt Oct 3, 2023
2964a87
Fix example expression for 32 bit
ZehMatt Oct 3, 2023
0e3c46b
Guard against exceptions during plugin load, use wide char for LoadLi…
ZehMatt Oct 3, 2023
c4e0071
Check for legacy install and show an error in the log
ZehMatt Oct 3, 2023
9ab8aa0
Specify the build config on CI
ZehMatt Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
56 changes: 24 additions & 32 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,53 +14,39 @@ jobs:
matrix:
dotnet-version: ['6.0.x']
platform:
- {arch: 'x86', dir: 'x32'}
- {arch: 'x64', dir: 'x64'}
- {build: 'Win32', arch: 'x32'}
- {build: 'x64', arch: 'x64'}
env:
CONFIGURATION: Release
PLATFORM: ${{ matrix.platform.arch }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Add msbuild to PATH
uses: microsoft/[email protected]
- name: Nuget dependencies
run: |
cd src
msbuild Dotx64Dbg.sln -t:restore -p:RestorePackagesConfig=true -maxcpucount:2 /m
IF %ERRORLEVEL% NEQ 0 (
ECHO MSBuild for Debug x64 returned error code %ERRORLEVEL%
EXIT /B %ERRORLEVEL%
)
cd ..
uses: microsoft/[email protected]
- name: Build
run: |
cd src
msbuild Dotx64Dbg.sln /p:platform=${{ matrix.platform.arch }} /m
IF %ERRORLEVEL% NEQ 0 (
ECHO MSBuild for Debug x64 returned error code %ERRORLEVEL%
EXIT /B %ERRORLEVEL%
)
cd ..
cmake . -B build -DCMAKE_BUILD_TYPE=Release -A ${{ matrix.platform.build }}
cmake --build build --config Release
- name: Tests
run: |
pushd .
cd bin\${{ matrix.platform.dir }}\tests
Tests.exe
cd bin\${{ matrix.platform.arch }}\tests
Dotx64DbgTests.exe
popd
- name: Upload artifacts (CI)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dotx64Dbg-${{ runner.os }}-${{ matrix.platform.arch }}
path: bin
path: bin/
if-no-files-found: error
package:
needs: build
name: Package
runs-on: ubuntu-latest
steps:
- name: Fetch artifacts
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
path: artifacts
- name: Display structure of downloaded files
Expand All @@ -70,22 +56,28 @@ jobs:
- name: Merge artifacts
shell: bash
run: |
mkdir package
cp -R -n ./artifacts/dotx64Dbg-Windows-x64/* ./package/
cp -R -n ./artifacts/dotx64Dbg-Windows-x86/* ./package/
rm -R ./package/x32/tests
rm -R ./package/x64/tests
mkdir -p package/x64/plugins/Dotx64Dbg
mkdir -p package/x32/plugins/Dotx64Dbg
mkdir package/dotplugins
mkdir package/dotscripts
rm -R ./artifacts/dotx64Dbg-Windows-x32/x32/tests
rm -R ./artifacts/dotx64Dbg-Windows-x64/x64/tests
cp -R -n ./artifacts/dotx64Dbg-Windows-x64/x64/* ./package/x64/plugins/Dotx64Dbg
cp -R -n ./artifacts/dotx64Dbg-Windows-x32/x32/* ./package/x32/plugins/Dotx64Dbg
cp -R -n ./artifacts/dotx64Dbg-Windows-x32/dotplugins/* ./package/dotplugins/
cp -R -n ./artifacts/dotx64Dbg-Windows-x32/dotscripts/* ./package/dotscripts/
cp -R -n ./artifacts/dotx64Dbg-Windows-x32/dotx64dbg.json ./package/dotx64dbg.json
find ./package -type f -name '*.pdb' -delete
find ./package -type f -name '*.lib' -delete
find ./package -type f -name '*.exp' -delete
find ./package -type f -name '*.ilk' -delete
- name: Upload package (CI)
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: dotx64dbg
path: package
if-no-files-found: error
- name: Compress artifacts
- name: Compress package
uses: papeloto/action-zip@v1
if: ${{ startsWith(github.ref, 'refs/tags/') }}
with:
Expand Down
Loading