ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2024-12-18 10:56:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert Temporary Changes (#2496)

Browse Source
This commit is contained in:
Florian Märkl 2020-12-08 17:27:54 +01:00 committed by GitHub
parent 7541c8910d
commit 822e377383
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.appveyor.yml
View File

@ -15,11 +15,6 @@ environment:
PACKAGE_NAME: cutter-git-x64.Windows PACKAGE_NAME: cutter-git-x64.Windows
install: install:
- ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
- ps: $fileContent += $env:priv_key.Replace(' ', "`n")
- ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
- ps: Set-Content $env:userprofile\.ssh\id_rsa $fileContent
# --
- ps: $env:path = ($env:path -split ";").Where({!($_ -like "*Microsoft SQL Server*")}) -join ";" - ps: $env:path = ($env:path -split ";").Where({!($_ -like "*Microsoft SQL Server*")}) -join ";"
- cmd: C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && scripts/fetch_deps.sh" - cmd: C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && scripts/fetch_deps.sh"
- cmd: set "CUTTER_DEPS=%APPVEYOR_BUILD_FOLDER%\cutter-deps" - cmd: set "CUTTER_DEPS=%APPVEYOR_BUILD_FOLDER%\cutter-deps"

2
.github/workflows/ccpp.yml vendored
View File

@ -29,7 +29,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
token: ${{ secrets.RIZIN_TOKEN }} # TODO: remove when the repo is public
submodules: recursive submodules: recursive
persist-credentials: false persist-credentials: false
- name: apt dependencies - name: apt dependencies
@ -86,7 +85,6 @@ jobs:
export PKG_CONFIG_PATH="$CUTTER_DEPS_PYTHON_PREFIX/lib/pkgconfig:${PKG_CONFIG_PATH:-}" export PKG_CONFIG_PATH="$CUTTER_DEPS_PYTHON_PREFIX/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH"
fi fi
set -euo pipefail #TODO: move to top once cutter-deps doesn't fail
if [[ "${{ matrix.cc-override }}" != "default" ]] if [[ "${{ matrix.cc-override }}" != "default" ]]
then then
export CC="${{matrix.cc-override}}" export CC="${{matrix.cc-override}}"

4
.gitmodules vendored
View File

@ -1,6 +1,6 @@
[submodule "rizin"] [submodule "rizin"]
path = rizin path = rizin
url = git@github.com:rizinorg/rizin url = https://github.com/rizinorg/rizin
[submodule "src/translations"] [submodule "src/translations"]
path = src/translations path = src/translations
url = git@github.com:rizinorg/cutter-translations url = https://github.com/rizinorg/cutter-translations

2
dist/CMakeLists.txt vendored
View File

@ -84,7 +84,7 @@ if(CUTTER_PACKAGE_RZ_GHIDRA)
# That way rz-ghidra build process is the same as with any other external plugin built against # That way rz-ghidra build process is the same as with any other external plugin built against
# installed Cutter. # installed Cutter.
ExternalProject_Add(rz-ghidra ExternalProject_Add(rz-ghidra
GIT_REPOSITORY git@github.com:rizinorg/rz-ghidra GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra
GIT_TAG master GIT_TAG master
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND "" BUILD_COMMAND ""

5
scripts/rz-ghidra.sh
View File

@ -7,10 +7,9 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
cd "$SCRIPTPATH/.." cd "$SCRIPTPATH/.."
if [[ ! -d rz-ghidra ]]; then if [[ ! -d rz-ghidra ]]; then
# remove depth, branch and uncomment lines bellow to use specifc commit # remove depth, branch and uncomment lines below to use specifc commit
git clone --recurse-submodules git@github.com:rizinorg/rz-ghidra.git --depth 1 --branch master || exit 1 git clone --recurse-submodules https://github.com/rizinorg/rz-ghidra.git --depth 1 --branch master || exit 1
# git clone --recurse-submodules https://github.com/rizinorg/rz-ghidra.git --depth 1 --branch master || exit 1
#pushd rz-ghidra #pushd rz-ghidra
#git checkout --recurse-submodules 5e845f4b50e8559bd51af03b22b6586e8cc5c35c #git checkout --recurse-submodules 5e845f4b50e8559bd51af03b22b6586e8cc5c35c