Allow publishing releases from existing version tags

Avoid narrowing large section sizes to int when choosing the minimum size and computing relative heights. Handle a zero minimum before dividing.

.clang-format

@@ -0,0 +1,120 @@
+# .clang-format for Qt Creator
+#
+# This is for clang-format >= 5.0.
+#
+# The configuration below follows the Qt Creator Coding Rules [1] as closely as
+# possible. For documentation of the options, see [2].
+#
+# Use ../../tests/manual/clang-format-for-qtc/test.cpp for documenting problems
+# or testing changes.
+#
+# In case you update this configuration please also update the qtcStyle() in src\plugins\clangformat\clangformatutils.cpp
+#
+# [1] https://doc-snapshots.qt.io/qtcreator-extending/coding-style.html
+# [2] https://clang.llvm.org/docs/ClangFormatStyleOptions.html
+#
+# yaml-language-server: $schema=https://json.schemastore.org/clang-format.json
+#
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveAssignments: None
+AlignConsecutiveDeclarations: None
+AlignEscapedNewlines: DontAlign
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: Never
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     true
+  AfterUnion:      false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: All
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeComma
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:    100
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - forever # avoids { wrapped to next line
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeCategories:
+  - Regex:           '^<Q.*'
+    Priority:        200
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+# InsertBraces: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+# Do not add QT_BEGIN_NAMESPACE/QT_END_NAMESPACE as this will indent lines in between.
+MacroBlockBegin: ""
+MacroBlockEnd:   ""
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 4
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 88
+PenaltyBreakBeforeFirstCallParameter: 300
+PenaltyBreakComment: 500
+PenaltyBreakFirstLessLess: 400
+PenaltyBreakString: 600
+PenaltyExcessCharacter: 50
+PenaltyReturnTypeOnItsOwnLine: 300
+PointerAlignment: Right
+ReflowComments:  false
+SortIncludes: CaseSensitive
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  Never
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard: c++17
+TabWidth:        4
+UseTab:          Never

.github/ISSUE_TEMPLATE/bug_report.md

@@ -4,18 +4,20 @@ about: Create a report to help us improve
 
 ---
 
-## Environment Details
-
-Despite we only fix issues reproducible in git-master branch, it's fine to report issues found in releases. And those will be closed when a new release comes out.
+## Environment
 
 ```sh
 # copypaste this script into your shell and replace it with the output
-iaito -v
 date
 r2 -v
+iaito -v
 uname -ms
 ```
 
 ## Description
 
-<!-- Explain what's the issue, how to repro and what you expect, we love screenshots -->
+<!-- Explain what's the issue and what would you expect to see -->
+
+## Test
+
+<!-- Steps to reproduce the issue and provide files/links/images/.. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +0,0 @@
-<!-- Filling this template is mandatory -->
-
-**Your checklist for this pull request**
-- [ ] I've read the [guidelines for contributing](https://cutter.re/docs/contributing/code/getting-started.html) to this repository
-- [ ] I made sure to follow the project's [coding style](https://cutter.re/docs/contributing/code/development-guidelines.html)
-- [ ] I've updated the [documentation](https://cutter.re/docs/user-docs.html) with the relevant information (if needed)
-
-
-**Detailed description**
-
-<!-- Explain the **details** for making this change. Is a new feature implemented? What existing problem does the pull request solve? How does the pull request solve these issues? Please provide enough information so that others can review your pull request. -->
-
-**Test plan (required)**
-
-<!-- What steps should the reviewer take to test your pull request? Demonstrate that the code is solid. Example: The exact actions you made and their outcome. Add screenshots/videos if the pull request changes UI. This is your time to re-check that everything works and that you covered all the edge cases -->
-
-
-<!-- **Code formatting**
-Make sure you ran astyle on your code before making the PR. Check our contribution guidelines here: https://cutter.re/docs/code.html -->
-
-**Closing issues**
-
-<!-- put "closes #XXXX" in your comment to auto-close the issue that your PR fixes (if such). -->

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -1,9 +1,18 @@
 name: iaito CI
 
 env:
-  R2V: 5.7.0
+  R2V: 6.2.6
+  R2GHIDRA_VERSION: 6.2.6
+  QT_MAC_INSTALL_VERSION: 6.11.*
+  QT_WIN_INSTALL_VERSION: 6.10.*
 
 on:
+  workflow_dispatch:
+    inputs:
+      release_tag:
+        description: Existing version tag to build and publish
+        required: true
+        type: string
   push:
     branches:
     - master
@@ -12,290 +21,533 @@ on:
     - master
 
 jobs:
-  acr-linux-r2git:
-    runs-on: ubuntu-20.04
+  source:
+    runs-on: ubuntu-24.04
+    outputs:
+      sha: ${{ steps.source.outputs.sha }}
+      r2: ${{ steps.source.outputs.R2V }}
+      r2ghidra: ${{ steps.source.outputs.R2GHIDRA_VERSION }}
+      qt_mac: ${{ steps.source.outputs.QT_MAC_INSTALL_VERSION }}
+      qt_win: ${{ steps.source.outputs.QT_WIN_INSTALL_VERSION }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
       with:
-        submodules: true # 'recursive' 'true' or 'false'
+        ref: ${{ inputs.release_tag && format('refs/tags/{0}', inputs.release_tag) || github.sha }}
         persist-credentials: false
-    - uses: actions/setup-python@v1
+    - name: Resolve build source and dependencies
+      id: source
+      env:
+        RELEASE_TAG: ${{ inputs.release_tag }}
+      shell: bash
+      run: |
+        if [ -n "$RELEASE_TAG" ]; then
+          [[ "$RELEASE_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
+          test "$(./configure -qV)" = "$RELEASE_TAG"
+        fi
+        echo "sha=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
+        python3 - <<'PYTHON'
+        import os
+        import re
+        from pathlib import Path
+
+        workflow = Path('.github/workflows/ci.yml').read_text()
+        keys = ('R2V', 'R2GHIDRA_VERSION', 'QT_MAC_INSTALL_VERSION', 'QT_WIN_INSTALL_VERSION')
+        with open(os.environ['GITHUB_OUTPUT'], 'a') as output:
+            for key in keys:
+                value = os.environ[key]
+                if os.environ['RELEASE_TAG']:
+                    match = re.search(r'^  ' + key + r': ([0-9.*]+)$', workflow, re.M)
+                    if not match:
+                        raise SystemExit(f'Missing dependency version: {key}')
+                    value = match.group(1)
+                print(f'{key}={value}', file=output)
+        PYTHON
+
+  acr-linux-r2git:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v7
       with:
-        python-version: 3.8.x
+        submodules: false # 'recursive' 'true' or 'false'
+        persist-credentials: false
+    - uses: actions/setup-python@v7
+      with:
+        python-version: 3.12.x
     - name: apt dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install libgraphviz-dev mesa-common-dev ninja-build
-        sudo apt-get install qt5-default libqt5svg5-dev qttools5-dev qttools5-dev-tools
+        sudo apt-get install -y libgraphviz-dev mesa-common-dev ninja-build meson libqt5svg5-dev qttools5-dev qttools5-dev-tools qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
     - name: install r2
-      run: |
-        git clone --depth=1 https://github.com/radareorg/radare2 r2git
-        cd r2git && sys/install.sh
+      run: git clone --depth=1 https://github.com/radareorg/radare2 r2git && CFLAGS=-O0 r2git/sys/install.sh
     - name: build iaito
       run: |
         ./configure --prefix=/usr
         make -j4
+    - name: command-line checks
+      run: python3 tests/commandline/test_commandline.py build/iaito
     - name: packaging
-      run: |
-        make -j -C dist/debian
-    - uses: actions/upload-artifact@v2
-      with:
-        name: iaito-amd64.deb
-        path: dist/debian/*/*.deb
-  acr-linux:
-    runs-on: ubuntu-20.04
+      run: make -j -C dist/debian
+  indent-check:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    runs-on: ubuntu-24.04
+    continue-on-error: true
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
       with:
-        submodules: true # 'recursive' 'true' or 'false'
         persist-credentials: false
-    - uses: actions/setup-python@v1
+    - name: install clang-format
+      run: sudo apt-get update && sudo apt-get install -y --no-install-recommends clang-format-20
+    - name: make indent
+      run: make indent-host && git diff --exit-code
+  acr-linux:
+    needs: source
+    env:
+      R2V: ${{ needs.source.outputs.r2 }}
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v7
       with:
-        python-version: 3.8.x
+        ref: ${{ needs.source.outputs.sha }}
+        submodules: false # 'recursive' 'true' or 'false'
+        persist-credentials: false
+    - uses: actions/setup-python@v7
+      with:
+        python-version: 3.12.x
     - name: apt dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install libgraphviz-dev mesa-common-dev ninja-build
-        sudo apt-get install qt5-default libqt5svg5-dev qttools5-dev qttools5-dev-tools
+        sudo apt-get install -y libgraphviz-dev mesa-common-dev ninja-build qt6-base-dev qt6-declarative-dev libqt6svg6-dev qt6-l10n-tools
+        echo /usr/lib/qt6/bin >> $GITHUB_PATH
     - name: install r2
       run: |
         wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2_${{env.R2V}}_amd64.deb
         wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-dev_${{env.R2V}}_amd64.deb
         sudo dpkg -i *.deb
+    - name: configure iaito
+      run: ./configure --prefix=/usr --with-qmake6
     - name: build iaito
-      run: |
-        ./configure --prefix=/usr
-        make -j4
+      run: make -j4
+    - name: command-line checks
+      if: ${{ hashFiles('tests/commandline/test_commandline.py') != '' }}
+      run: python3 tests/commandline/test_commandline.py build/iaito
     - name: packaging
-      run: |
-        make -C dist/debian
-    - uses: actions/upload-artifact@v2
+      run: make -C dist/debian
+    - uses: actions/upload-artifact@v7
       with:
         name: iaito-amd64.deb
         path: dist/debian/*/*.deb
-  acr-macos:
-    runs-on: macos-latest
+  acr-linux-nodebugger:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v7
       with:
-        submodules: true # 'recursive' 'true' or 'false'
+        submodules: false # 'recursive' 'true' or 'false'
         persist-credentials: false
-    - uses: actions/setup-python@v1
+    - uses: actions/setup-python@v7
       with:
-        python-version: 3.8.x
-    - name: homebrew dependencies
-      run: |
-        brew update
-        brew install coreutils pkg-config qt@5
-        brew unlink qt@5 || true
-        brew link --force qt@5
-        pip3 install meson
-    - name: install r2
-      run: |
-        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-${{env.R2V}}.pkg
-        sudo installer -pkg *.pkg -target /
-    - name: build iaito
-      run: |
-        export PATH="/usr/local/opt/qt@5/bin:$PATH"
-        export PATH="/opt/homebrew/opt/qt@5/bin:$PATH" # doesnt seems to be necessary
-        export LDFLAGS="-L/usr/local/opt/qt@5/lib"
-        export CPPFLAGS="-I/usr/local/opt/qt@5/include"
-        export PKG_CONFIG_PATH="/usr/local/opt/qt@5/lib/pkgconfig"
-        ./configure
-        make -j4
-    - name: packaging
-      run: |
-        make -C dist/macos
-    - uses: actions/upload-artifact@v2
-      with:
-        name: iaito-mac-amd64.zip
-        path: dist/macos/iaito*.zip
-  build:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04, macos-latest, windows-latest]
-        python-version: [3.8.x]
-        system-deps: [false]
-        cc-override: [default]
-        cxx-override: [default]
-      # Prevent one job from pausing the rest
-      fail-fast: false
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: true # 'recursive' 'true' or 'false'
-        persist-credentials: false
+        python-version: 3.12.x
     - name: apt dependencies
-      if: contains(matrix.os, 'ubuntu')
       run: |
         sudo apt-get update
-        sudo apt-get install libgraphviz-dev mesa-common-dev
-        sudo apt-get install ninja-build
-        if [[ "${{ matrix.system-deps }}" = "true" ]]
-        then
-          sudo apt-get install qt5-default libqt5svg5-dev qttools5-dev qttools5-dev-tools
-        fi
-    - uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: homebrew dependencies
-      if: contains(matrix.os, 'macos')
+        sudo apt-get install -y libgraphviz-dev mesa-common-dev ninja-build qt6-base-dev qt6-declarative-dev libqt6svg6-dev qt6-l10n-tools
+        echo /usr/lib/qt6/bin >> $GITHUB_PATH
+    - name: install r2
       run: |
-        rm '/usr/local/bin/2to3' # symlink to some kind of existing python2.7 installation conflicts with brew python3 which gets installed as indirect dependency
-        brew update --preinstall # temporary workaround for https://github.com/Homebrew/homebrew-bundle/issues/751
-        brew bundle
-        brew install coreutils
-        brew install pkg-config
-    - name: py dependencies
+        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2_${{env.R2V}}_amd64.deb
+        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-dev_${{env.R2V}}_amd64.deb
+        sudo dpkg -i *.deb
+    - name: configure iaito
+      run: ./configure --prefix=/usr --with-qmake6 --without-debugger
+    - name: build iaito
+      run: make -j4
+    - name: command-line checks
+      run: python3 tests/commandline/test_commandline.py build/iaito
+  acr-macos:
+    needs: source
+    env:
+      R2V: ${{ needs.source.outputs.r2 }}
+      R2GHIDRA_VERSION: ${{ needs.source.outputs.r2ghidra }}
+      QT_MAC_INSTALL_VERSION: ${{ needs.source.outputs.qt_mac }}
+      QT_WIN_INSTALL_VERSION: ${{ needs.source.outputs.qt_win }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - arch: arm64
+            runs-on: macos-latest
+          - arch: x64
+            runs-on: macos-15-intel
+            arch_alt: x86_64
+    name: acr-macos-${{ matrix.arch }}
+    runs-on: ${{ matrix.runs-on }}
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        ref: ${{ needs.source.outputs.sha }}
+        submodules: false # 'recursive' 'true' or 'false'
+        persist-credentials: false
+    - uses: actions/setup-python@v7
+      with:
+        python-version: 3.12.x
+    - name: uname
+      run: uname -a
+    - name: install dependencies
+      run: pip3 install meson ninja
+    - name: install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{env.QT_MAC_INSTALL_VERSION}}
+    - name: download radare components
+      working-directory: dist/macos
+      env:
+        GH_TOKEN: ${{github.token}}
+      run: |
+        validate_download() {
+          case "$2" in
+            tar.gz) tar -tzf "$1" >/dev/null 2>&1 ;;
+            zip) unzip -tq "$1" >/dev/null 2>&1 ;;
+            *) test -s "$1" ;;
+          esac
+        }
+        download() {
+          local output="$1"
+          local url="$2"
+          local type="$3"
+          local attempt
+
+          for ((attempt = 1; attempt <= 3; attempt++)); do
+            rm -f "${output}.tmp"
+            if curl --fail --location --silent --show-error \
+              --connect-timeout 30 --max-time 300 --output "${output}.tmp" "$url" \
+              && validate_download "${output}.tmp" "$type"; then
+              mv "${output}.tmp" "$output"
+              return 0
+            fi
+            if [ "$attempt" -lt 3 ]; then
+              echo "Download of ${output} failed (attempt ${attempt}/3); retrying in 10s"
+              sleep 10
+            fi
+          done
+          echo "::error::Unable to download a valid ${output} after 3 attempts"
+          return 1
+        }
+
+        r2ai_version="$(gh api /repos/radareorg/r2ai/releases/latest --jq .tag_name)"
+        download radare2.pkg "https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-${{matrix.arch}}-${{env.R2V}}.pkg" pkg
+        download r2ai.tar.gz "https://github.com/radareorg/r2ai/archive/refs/tags/${r2ai_version}.tar.gz" tar.gz
+        download r2ghidra.zip "https://github.com/radareorg/r2ghidra/releases/download/${{env.R2GHIDRA_VERSION}}/r2ghidra-${{env.R2GHIDRA_VERSION}}-macos-${{matrix.arch_alt||matrix.arch}}.zip" zip
+        download r2ghidra_sleigh.zip "https://github.com/radareorg/r2ghidra/releases/download/${{env.R2GHIDRA_VERSION}}/r2ghidra_sleigh-${{env.R2GHIDRA_VERSION}}.zip" zip
+        make unpack-comps
+    - name: install r2
+      run: sudo installer -pkg dist/macos/radare2.pkg -target /
+    - name: build iaito
+      run: |
+        ./configure
+        make -j4 -C dist/macos app
+    - name: ad-hoc sign
+      run: codesign --force --deep -s - dist/macos/disk/iaito.app
+    - name: packaging
+      run: make -C dist/macos zip
+    - uses: actions/upload-artifact@v7
+      with:
+        name: iaito-macos-${{ matrix.arch }}
+        path: dist/macos/iaito.zip
+  meson:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v7
+      with:
+        submodules: false # 'recursive' 'true' or 'false'
+        persist-credentials: false
+    - name: apt dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y libgraphviz-dev mesa-common-dev ninja-build libqt5svg5-dev qttools5-dev qttools5-dev-tools qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
+    - name: install r2
+      run: |
+        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2_${{env.R2V}}_amd64.deb
+        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-dev_${{env.R2V}}_amd64.deb
+        sudo dpkg -i *.deb
+    - uses: actions/setup-python@v7
+      with:
+        python-version: 3.12.x
+    - name: meson+ninja ubuntu
       run: |
         pip install meson
-    - uses: actions/upload-artifact@v2
-      if: contains(matrix.os, 'ubuntu')
+        meson setup build src
+        ninja -C build -j4
+  w64-meson:
+    needs: source
+    env:
+      R2V: ${{ needs.source.outputs.r2 }}
+      QT_WIN_INSTALL_VERSION: ${{ needs.source.outputs.qt_win }}
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v7
       with:
-        name: iaito_amd64.deb
-        path: dist/debian/*/*.deb
-    - name: cmake ubuntu
-      if: contains(matrix.os, 'ubuntu')
+        ref: ${{ needs.source.outputs.sha }}
+        submodules: false
+        persist-credentials: false
+    - name: Preparing msvc toolchain
+      uses: TheMrMilchmann/setup-msvc-dev@v4
+      with:
+        arch: x64
+    - name: install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: ${{env.QT_WIN_INSTALL_VERSION}}
+    - name: install dependencies
+      shell: cmd
+      run: pip install ninja "meson==1.10.2"
+    - name: install r2 (preconfigure)
+      shell: bash
       run: |
-        if [[ "${{ matrix.system-deps }}" = "false" ]]
-        then
-          scripts/fetch_deps.sh
-          source cutter-deps/env.sh
-          export PKG_CONFIG_PATH="$CUTTER_DEPS_PYTHON_PREFIX/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
-          export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH"
-        fi
-        set -euo pipefail #TODO: move to top once cutter-deps doesn't fail
-        if [[ "${{ matrix.cc-override }}" != "default" ]]
-        then
-          export CC="${{matrix.cc-override}}"
-          export CXX="${{matrix.cxx-override}}"
-        fi
+        curl -L -o r2.zip https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-${{env.R2V}}-w64.zip
+        7z x r2.zip
+        mv radare2-${{env.R2V}}-w64 radare2
+        # XXX workaround for r2-6.2.4 headers not being msvc c++ friendly (fixed in r2 master)
+        sed -i 's/(RStrs) { NULL, NULL }/r_strs_new (NULL, NULL)/' radare2/include/libr/r_cmd.h
+        echo "%CD%\radare2\bin" >> $GITHUB_PATH
+    - name: configure
+      shell: cmd
+      run: configure.bat
+    - name: make
+      shell: cmd
+      env:
+        ARCH: x64
+      run: make.bat -Dwith_qt6=true
+    - name: dist
+      shell: cmd
+      run: 7z a iaito.zip iaito
+    - uses: actions/upload-artifact@v7
+      with:
+        name: iaito-w64.exe
+        path: iaito\iaito.exe
+    - uses: actions/upload-artifact@v7
+      with:
+        name: iaito-w64.zip
+        path: iaito.zip
 
-        mkdir build
-        cd build
-        cmake --version
-        if [[ "${{ matrix.system-deps }}" = "false" ]]
-        then
-          cmake \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DIAITO_ENABLE_PYTHON=ON \
-            -DPYTHON_LIBRARY="$CUTTER_DEPS_PYTHON_PREFIX/lib/libpython3.6m.so.1.0" \
-            -DPYTHON_INCLUDE_DIR="$CUTTER_DEPS_PYTHON_PREFIX/include/python3.6m" \
-            -DPYTHON_EXECUTABLE="$CUTTER_DEPS_PYTHON_PREFIX/bin/python3" \
-            -DIAITO_ENABLE_PYTHON_BINDINGS=OFF \
-            -DIAITO_ENABLE_CRASH_REPORTS=ON \
-            -DIAITO_USE_BUNDLED_RADARE2=ON \
-            ../src
-        else
-          cmake \
-            -G Ninja \
-            -DCMAKE_BUILD_TYPE=Release \
-            -DIAITO_USE_BUNDLED_RADARE2=ON \
-            ../src
-        fi
-        ninja
-    - name: cmake macos
-      shell: bash
-      if: contains(matrix.os, 'macos')
-      run: |
-        set -euo pipefail
-        wget -q https://github.com/radareorg/radare2/releases/download/${{env.R2V}}/radare2-${{env.R2V}}.pkg
-        sudo installer -pkg *.pkg -target /
-        export PATH=/usr/local/opt/llvm/bin:$PATH
-        mkdir build
-        cd build
-        cmake \
-                -DCMAKE_BUILD_TYPE=Release \
-                -DIAITO_ENABLE_PYTHON=ON \
-                -DIAITO_ENABLE_PYTHON_BINDINGS=OFF \
-                -DIAITO_ENABLE_CRASH_REPORTS=ON \
-                -DIAITO_USE_BUNDLED_RADARE2=ON \
-                -DIAITO_ENABLE_PACKAGING=ON \
-                -DIAITO_PACKAGE_DEPENDENCIES=ON \
-                -DIAITO_ENABLE_DEPENDENCY_DOWNLOADS=ON \
-                ../src && \
-              make -j4;
-        make package
-        export IAITO_VERSION=$(python3 ../scripts/get_version.py)
-        echo PACKAGE_NAME=iaito-mac.tar.gz >> $GITHUB_ENV
-        cd .. && make -C dist/macos
-    - uses: actions/upload-artifact@v2
-      if: contains(matrix.os, 'macos')
-      with:
-        name: iaito-mac.pkg
-        path: dist/macos/macos-pkg/*.pkg
-    - name: windows dependencies
-      if: contains(matrix.os, 'windows-latest')
-      shell: bash
-      run: |
-        pip install ninja
-        scripts/fetch_deps.sh
-        choco install winflexbison3
-    - name: w64-make
-      if: contains(matrix.os, 'windows-latest')
-      shell: cmd
-      run: |
-        set ARCH=x64
-        set IAITO_DEPS=%CD%\cutter-deps
-        set PATH=%CD%\cutter-deps\qt\bin;%CD%\r2_dist\bin;%PATH%
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        call preconfigure.bat
-        call configure.bat
-        call make.bat
-        cd
-        mkdir build
-        cd build
-        set PACKAGE_NAME=iaito-w64
-        cmake ^
-          -DCMAKE_BUILD_TYPE=Release ^
-          -DIAITO_PACKAGE_DEPENDENCIES=ON ^
-          -DIAITO_ENABLE_DEPENDENCY_DOWNLOADS=ON ^
-          -DIAITO_ENABLE_CRASH_REPORTS=ON ^
-          -DCMAKE_PREFIX_PATH="%CUTTER_DEPS%\pyside" ^
-          -DCPACK_PACKAGE_FILE_NAME=%PACKAGE_NAME% ^
-          -G Ninja ^
-          ../src
-        cmake --build . --config Release
-        cmake --build . --config Release --target package
-        echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
-    # -DIAITO_ENABLE_PYTHON=ON ^
-    # -DIAITO_ENABLE_PYTHON_BINDINGS=ON ^
-    - uses: actions/upload-artifact@v2
-      if: env.PACKAGE_NAME != null
-      with:
-        name: ${{ env.PACKAGE_NAME }}
-        path: build/${{ env.PACKAGE_NAME }}
-    - name: w64-cmake
-      if: contains(matrix.os, 'windows-latest')
-      shell: cmd
-      run: |
-        set ARCH=x64
-        set IAITO_DEPS=%CD%\cutter-deps
-        set PATH=%CD%\cutter-deps\qt\bin;%CD%\r2_dist\bin;%PATH%
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
-        call preconfigure.bat
-        cd
-        mkdir build
-        cd build
-        set PACKAGE_NAME=iaito-w64
-        cmake ^
-          -DCMAKE_BUILD_TYPE=Release ^
-          -DIAITO_PACKAGE_DEPENDENCIES=ON ^
-          -DIAITO_ENABLE_DEPENDENCY_DOWNLOADS=ON ^
-          -DIAITO_ENABLE_CRASH_REPORTS=ON ^
-          -DCMAKE_PREFIX_PATH="%CUTTER_DEPS%\pyside" ^
-          -DCPACK_PACKAGE_FILE_NAME=%PACKAGE_NAME% ^
-          -G Ninja ^
-          ../src
-        cmake --build . --config Release
-        cmake --build . --config Release --target package
-        echo PACKAGE_NAME=%PACKAGE_NAME%.zip >> %GITHUB_ENV%
-    # -DIAITO_ENABLE_PYTHON=ON ^
-    # -DIAITO_ENABLE_PYTHON_BINDINGS=ON ^
-    - uses: actions/upload-artifact@v2
-      if: env.PACKAGE_NAME != null
-      with:
-        name: ${{ env.PACKAGE_NAME }}
-        path: build/${{ env.PACKAGE_NAME }}
+  check_release:
+    if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref == 'refs/heads/master') }}
+    outputs:
+      is_release: ${{ steps.release.outputs.is }}
+      tag_name: ${{ steps.release.outputs.tag }}
+    needs:
+      - source
+      - acr-linux
+      - acr-macos
+      - w64-meson
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          ref: ${{ needs.source.outputs.sha }}
+          fetch-depth: 0 # Download all git history and tags
+      - name: Check if is a release
+        run: git describe --exact-match --tags HEAD | awk 'BEGIN{tag="-";r="no"}/^[0-9]+\.[0-9]+/{tag=$0;r="yes"};END{print "is="r;print "tag="tag}' >> ${GITHUB_OUTPUT}
+        id: release
+
+  macos-sign:
+    if: ${{ needs.check_release.outputs.is_release == 'yes' }}
+    needs:
+      - check_release
+    runs-on: macos-latest
+    environment: release
+    # Environment secrets for signing:
+    #   APPLE_DEVELOPER_CERTIFICATE_P12_BASE64:
+    #     Base64 of the p12 export (cert+private key), the certificate must be named
+    #     "Developer ID Application: DEVELOPER_NAME (TEAM_ID)"
+    #   APPLE_DEVELOPER_CERTIFICATE_PASSWORD: Random password used to encrypt the exported P12
+    # Environment secrets for notarization:
+    #   APPLE_DEVELOPER_ID: email of the developer
+    #   APPLE_TEAM_ID: Team ID (can be extracted from the certificate name too)
+    #   APPLE_APP_SPECIFIC_PASSWORD: https://support.apple.com/en-us/102654
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          ref: refs/tags/${{ needs.check_release.outputs.tag_name }}
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v8
+        with:
+          pattern: iaito-macos-*
+          path: dist/artifacts
+       
+      - name: Install Apple Certificate
+        env:
+          CERTIFICATE_BASE64: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_P12_BASE64 }}
+          CERTIFICATE_PASSWORD: ${{ secrets.APPLE_DEVELOPER_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: "keychainpass-${{ github.run_id }}"
+        run: |
+          # Create keychain
+          security create-keychain -p "${KEYCHAIN_PASSWORD}" release.keychain
+          security default-keychain -s release.keychain
+          security unlock-keychain -p "${KEYCHAIN_PASSWORD}" release.keychain
+          security set-keychain-settings -t 3600 -u release.keychain
+          
+          # Import certificate
+          echo "$CERTIFICATE_BASE64" | base64 --decode > certificate.p12
+          security import certificate.p12 -k release.keychain -P "${CERTIFICATE_PASSWORD}" -T /usr/bin/codesign
+          security set-key-partition-list -S apple-tool:,apple: -s -k "${KEYCHAIN_PASSWORD}" release.keychain
+          
+          # Check if the certificate was imported correctly and find its identity
+          security find-identity -v -p codesigning release.keychain
+          
+          # Clean up
+          rm certificate.p12
+
+      - name: Sign and package the App Bundle
+        run: |
+          # Find the Developer ID Application certificate identity
+          IDENTITY=$(security find-identity -v -p codesigning | awk '/Developer ID Application/{print $2;exit}')
+          
+          if [ -z "$IDENTITY" ]; then
+            echo "Error: No Developer ID Application certificate found in keychain"
+            exit 1
+          fi
+
+          # Sign and package for all architectures
+          for arch in arm64 x64; do
+            echo "[${arch}] Extracting build..."
+            mkdir -p dist/macos/disk
+            ditto -x -k dist/artifacts/iaito-macos-${arch}/iaito.zip dist/macos/disk/
+
+            echo "[${arch}] Signing app bundle..."
+            codesign --force --deep --options runtime --entitlements "dist/macos/iaito.entitlements" --sign "$IDENTITY" dist/macos/disk/iaito.app
+            codesign --verify --verbose dist/macos/disk/iaito.app
+  
+            echo "[${arch}] Packaging into DMG..."
+            rm -v dist/macos/disk/READ*.txt # no workaround needed
+            ln -fs /Applications dist/macos/disk/
+            (cd dist/macos; hdiutil create -format UDZO -fs APFS -volname iaito -srcfolder disk iaito)
+            mv -v dist/macos/iaito.dmg "iaito-${arch}.dmg"
+            rm -fR dist/macos/disk
+  
+            echo "[${arch}] Signing DMG..."
+            codesign --force --sign "$IDENTITY" --timestamp "iaito-${arch}.dmg"
+          done
+
+      - name: Notarize DMG
+        env:
+          APPLE_ID: ${{ secrets.APPLE_DEVELOPER_ID }}
+          TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+          APP_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
+        run: |
+          for arch in arm64 x64; do
+            echo "[${arch}] Notary DMG..."
+            xcrun notarytool submit "iaito-${arch}.dmg" --apple-id "$APPLE_ID" --team-id "$TEAM_ID" --password "$APP_PASSWORD" --wait
+            xcrun stapler staple "iaito-${arch}.dmg"
+          done
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: iaito-arm64.dmg
+          path: iaito-arm64.dmg
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: iaito-x64.dmg
+          path: iaito-x64.dmg
+      
+      - name: Remove keychain
+        if: always()
+        run: security delete-keychain release.keychain
+
+  release:
+    permissions:
+      contents: write
+    if: ${{ needs.check_release.outputs.is_release == 'yes' }}
+    needs:
+      - macos-sign
+      - check_release
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v7
+        with:
+          ref: refs/tags/${{ needs.check_release.outputs.tag_name }}
+          fetch-depth: 0 # Download all git history and tags
+      - name: Extract version
+        run: echo "string=`./configure -qV`" >> $GITHUB_OUTPUT
+        id: version
+      - name: Prepare release notes
+        env:
+          RELEASE_TAG: ${{ needs.check_release.outputs.tag_name }}
+        run: |
+          previous=$(git describe --tags --abbrev=0 "${RELEASE_TAG}^")
+          ./scripts/release-notes.sh "$previous" "$RELEASE_TAG" | tee ./RELEASE_NOTES.md
+      - name: Download artifacts
+        uses: actions/download-artifact@v8
+        with:
+          path: dist/artifacts
+      - name: Display structure of downloaded files
+        run: find dist/artifacts
+      - name: Create GitHub release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ needs.check_release.outputs.tag_name }}
+          release_name: ${{ steps.version.outputs.string }}
+          body_path: ./RELEASE_NOTES.md
+          draft: true
+          prerelease: false
+      - name: Upload Linux asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/artifacts/iaito-amd64.deb/iaito/iaito_${{ steps.version.outputs.string }}_amd64.deb
+          asset_name: iaito_${{ steps.version.outputs.string }}_amd64.deb
+          asset_content_type: application/vnd.debian.binary-package
+      - name: Upload macOS x64 asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/artifacts/iaito-x64.dmg/iaito-x64.dmg
+          asset_name: iaito_${{ steps.version.outputs.string }}_x64.dmg
+          asset_content_type: application/vnd.debian.binary-package
+      - name: Upload macOS arm64 asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/artifacts/iaito-arm64.dmg/iaito-arm64.dmg
+          asset_name: iaito_${{ steps.version.outputs.string }}_arm64.dmg
+          asset_content_type: application/vnd.debian.binary-package
+      - name: Upload Windows QtDeploy asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/artifacts/iaito-w64.zip/iaito.zip
+          asset_name: iaito-${{ steps.version.outputs.string }}-w64.zip
+          asset_content_type: application/zip
+      - name: Upload Windows executable
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: dist/artifacts/iaito-w64.exe/iaito.exe
+          asset_name: iaito-${{ steps.version.outputs.string }}.exe
+          asset_content_type: application/zip
+      - name: Publish complete release
+        env:
+          GH_TOKEN: ${{ github.token }}
+          RELEASE_ID: ${{ steps.create_release.outputs.id }}
+        run: |
+          gh api --method PATCH "repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}" \
+            -F draft=false -f make_latest=legacy --jq .html_url

.github/workflows/semgrep.yml

@@ -0,0 +1,23 @@
+on:
+  pull_request: {}
+  push:
+    branches:
+    - main
+    - master
+    paths:
+    - .github/workflows/semgrep.yml
+  schedule:
+  # random HH:MM to avoid a load spike on GitHub Actions at 00:00
+  - cron: 45 3 * * *
+name: Semgrep
+jobs:
+  semgrep:
+    name: Scan
+    runs-on: ubuntu-24.04
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+    container:
+      image: returntocorp/semgrep
+    steps:
+    - uses: actions/checkout@v7
+    - run: semgrep ci

.gitignore

@@ -1,96 +1,109 @@
-# Binaries
-AStyle*
-
-# OSX files
-*.DS_Store
-.AppleDouble
-.LSOverride
-
-# C++ objects and libs
-*.slo
-*.lo
-*.o
-*.a
-*.la
-*.lai
-*.so
-*.dll
-*.dylib
-
-# Qt files
-*.qmake.cache
-*.qmake.stash
-*.pro.user
-*.pro.user.*
-*.qbs.user
-*.qbs.user.*
-*.moc
-moc_*.cpp
-qrc_*.cpp
-moc_*.h
-ui_*.h
-build*/
-cmake-build-*/
-/src-build/
-
-# Build folders
-Debug
-Release
-
-# QtCreator
-*.autosave
-*.qmlproject.user
-*.qmlproject.user.*
-CMakeLists.txt.user
-
-# CLion
-.idea
-
-# Vim
-*.swp
-*~
-
-# Git mergetool
-~.orig
-
-# CMake Files:
-src/*_automoc.cpp
-*CMakeCache.txt*
-*cmake_install.cmake*
-src/CMakeFiles/*
-
-# Prepare_r2
-ninja.exe
-r2_dist_x86/
-r2_dist_x64/
-r2_dist/
-*.pdb
-
-# Mesonbuild
-src/subprojects/
-
-# Python
-__pycache__
-/python/
-
-# Other
-compile_commands.json
-.ccls-cache
-docs/source/_build
-
-# vscode
-/.vscode/*
-!/.vscode/settings.json
-!/.vscode/extensions.json
-
-# Visual Studio CMake
-src/out
-.vs
-
-# cutter-deps
-/cutter-deps
-
-/breakpad
-
-# astyle backup .orig files
-*.orig
+# Binaries
+AStyle*
+./config.mk
+config.mk
+
+# Generated configuration header (qmake / Meson)
+IaitoConfig.h
+
+# OSX files
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# C++ objects and libs
+*.slo
+*.lo
+*.o
+*.a
+*.la
+*.lai
+*.so
+*.dll
+*.dylib
+
+# Qt files
+*.qmake.cache
+*.qmake.stash
+src/Makefile
+*.pro.user
+*.pro.user.*
+*.qbs.user
+*.qbs.user.*
+*.moc
+moc_*.cpp
+qrc_*.cpp
+moc_*.h
+ui_*.h
+build*/
+cmake-build-*/
+/src-build
+
+# Build folders
+Debug
+Release
+
+# QtCreator
+*.autosave
+*.qmlproject.user
+*.qmlproject.user.*
+CMakeLists.txt.user
+
+# CLion
+.idea
+
+# Vim
+*.swp
+*~
+
+# Git mergetool
+~.orig
+
+# CMake Files:
+src/*_automoc.cpp
+*CMakeCache.txt*
+*cmake_install.cmake*
+src/CMakeFiles/*
+
+# Prepare_r2
+ninja.exe
+r2_dist_x86/
+r2_dist_x64/
+r2_dist/
+*.pdb
+
+# Mesonbuild
+src/subprojects/
+
+# Python
+__pycache__
+/python/
+
+# Other
+compile_commands.json
+.ccls-cache
+docs/source/_build
+
+# vscode
+/.vscode/*
+!/.vscode/settings.json
+!/.vscode/extensions.json
+
+# Visual Studio CMake
+src/out
+.vs
+
+# astyle backup .orig files
+*.orig
+
+# Translations
+src/translations
+
+# macOS package
+/dist/macos/radare2.pkg
+/dist/macos/radare2-unpkg
+/dist/macos/disk
+/dist/macos/extra
+/dist/macos/*.dmg
+/dist/macos/*.zip
+/dist/macos/*.tar.gz

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "src/translations"]
-	path = src/translations
-	url = https://github.com/radareorg/iaito-translations

.vscode/extensions.json

@@ -1,7 +0,0 @@
-{
-	"recommendations": [
-		"ms-vscode.cpptools",
-		"ms-vscode.cmake-tools",
-		"twxs.cmake"
-	]
-}

.vscode/settings.json

@@ -1,6 +0,0 @@
-{
-    "cmake.sourceDirectory": "${workspaceFolder}/src",
-    "cmake.configureSettings": {
-        "IAITO_USE_BUNDLED_RADARE2": "ON"
-    }
-}

AGENTS.md

@@ -0,0 +1,72 @@
+# Agentic Coding Guidelines for the iaito project
+
+## Overview
+
+iaito is the official Qt-based GUI for radare2. It uses qmake for building and requires radare2 and Qt5/6.
+
+## Locations
+
+- Source code is in `./src/` (widgets, dialogs, menus, common, core, plugins)
+- Qt project file: `./src/Iaito.pro`
+- Plugin interface: `./src/plugins/IaitoPlugin.h`
+- Sample plugins: `./src/plugins/sample-cpp/` and `./src/plugins/sample-python/`
+- UI forms: `./src/dialogs/*.ui` and `./src/widgets/*.ui`
+- Resources: `./src/resources.qrc`, `./src/themes/`
+
+## Formatting Style
+
+- Follow C++ / Qt Creator coding style (see `.clang-format`)
+  - Indent with **4 spaces** (no tabs)
+  - Column limit: 100 characters
+- Use `make fmt` to format the whole project source
+
+## Coding Rules
+
+- C++20 standard
+- Code must be portable across windows, macos and linux
+- Use Qt signals/slots for communication between components
+- Widgets inherit from `IaitoDockWidget` or `AddressableDockWidget`
+- Access radare2 via the `Core()` singleton (defined in `core/Iaito.h`)
+- Use `CutterCore::cmd()` and `CutterCore::cmdj()` for r2 commands
+
+## Actions
+
+- Configure: `./configure`
+- Build: `make -j8 > /dev/null`
+  - Never run qmake or compilers directly
+  - Limit to 8 jobs to avoid resource exhaustion
+  - Redirect stdout to /dev/null to reduce noise
+- Run: `make run`
+- Clean: `make clean`
+- Install to home: `make user-install`
+- Build r2 plugin: `make plugin`
+
+## Dependencies
+
+Requires radare2 installed system-wide:
+```sh
+git clone https://github.com/radareorg/radare2 && radare2/sys/install.sh
+```
+
+Qt5 packages (Debian/Ubuntu):
+```sh
+sudo apt install qttools5-dev qtbase5-dev libqt5svg5-dev
+```
+
+## Adding Widgets
+
+1. Create `.h`, `.cpp`, and `.ui` files in `src/widgets/`
+2. Add to `SOURCES`, `HEADERS`, `FORMS` in `src/Iaito.pro`
+3. Register in `core/MainWindow.cpp`
+
+## Adding Plugins
+
+- C++ plugins: see `src/plugins/sample-cpp/`
+- Python plugins: see `src/plugins/sample-python/`
+- Implement `IaitoPlugin` interface from `plugins/IaitoPlugin.h`
+
+## Debugging
+
+- Run with: `R2_DEBUG=1 make run`
+- Debug with gdb: `make gdb`
+- Debug with lldb: `make lldb`

CONTRIBUTING.md

@@ -1,25 +1,30 @@
 # Contributing to iaito
 
+Iaito is not in active development, the current focus of the project is in simplicity, reduce
+tech debt by removing superfluous, anoying or mainly unused dependencies like python support
+or plugins, breakpad, the cmake build system, crash reports or auto-updates features, as long as
+the project is under low maintainance mode is good to remove stuff that distract the attention
+from the core which is the one that should be handling all that stuff. Iaito focus on exposing
+the capabilities of r2 instead of duplicating efforts in a GUI.
+
 There are different ways you can help contributing to Iaito:
 
 ## Opening an issue
 
-Make a clear description of the bug/feature, use screenshots, send binaries, etc.
-This will help us improve the software for you.
 You can create an issue by clicking on [this link](https://github.com/radareorg/iaito/issues/new/choose).
 
 ## Submit a Pull Request
 
-Note that cutter is still under development and many parts of the code are to be improved.
-The best way is to check the opened issues [here](https://github.com/radareorg/iaito/issues) or discuss with radareorg team.
-Please follow our contribution guidelines: https://cutter.re/docs/contributing.html
+If you are feeling brave, create a patch by editing the files in github web interface by pressing the pencil
+button or fork the repository, create a branch and submit your changes as a pull request.
 
-## Write Some Documentation
-
-The documentation is something important for newcomers. As of today the documentation can be found [here](https://cutter.re/docs/) and it stands in the [docs](https://github.com/radareorg/iaito/tree/master/docs) folder.
-The API Reference is automatically generated from the source code, so it is strongly advised to document your code.
-Check issues marked as "Documentation" on our issues [list](https://github.com/radareorg/iaito/issues?q=is%3Aissue+is%3Aopen+label%3ADocumentation).
+Feel free to use the radare discord, telegram or irc chats to discuss your ideas, proposals or changes
 
 ## Translations
 
-You can help Iaito by adding translations to the project! We use the [Crowdin](https://crowdin.com/project/iaito) platform to help us share translations. Feel free to contribute and add translations to the project. If you need to add a language, ask any radareorg developer.
+Translation files are downloaded from the [Crowdin](https://crowdin.com/project/iaito) platform, where many
+users can help to review and maintain different languages.
+
+## Backporting
+
+It is somewhat desired to backport features or changes already available in Cutter.

Makefile

@@ -1,4 +1,4 @@
-include config.mk
+-include config.mk
 
 ifeq ($(shell uname),Darwin)
 BIN=build/iaito.app/Contents/MacOS/iaito
@@ -6,83 +6,179 @@ else
 BIN=build/iaito
 endif
 
-# linux or win
-IAITO_OS=macos
-IAITO_DEPS_URL=https://github.com/rizinorg/cutter-deps/releases/download/v13/cutter-deps-$(IAITO_OS).tar.gz
+QMAKE_FLAGS+=-config release
 
-ifeq ($(WANT_PYTHON),1)
-QMAKE_FLAGS+=IAITO_ENABLE_PYTHON=true
+#install_name_tool -change /path/to/Qt/lib/QtCore.framework/Versions/4.0/QtCore
+#        @executable_path/../Frameworks/QtCore.framework/Versions/4.0/QtCore
+#       plugandpaint.app/Contents/plugins/libpnp_basictools.dylib
 
-# cutter deps should provide deps.mk
-CMAKE_FLAGS+=-DPYTHON_LIBRARY="$(IAITO_DEPS)/python/lib/libpython3.6m.so.1.0"
-CMAKE_FLAGS+=-DPYTHON_INCLUDE_DIR="$(IAITO_DEPS)/include/python3.6m"
-CMAKE_FLAGS+=-DPYTHON_EXECUTABLE="$(IAITO_DEPS)/bin/python3"
-CMAKE_FLAGS+=-DIAITO_ENABLE_PYTHON=ON
-CMAKE_FLAGS+=-DIAITO_ENABLE_PYTHON_BINDINGS=ON
-endif
 ifeq ($(WANT_PYTHON_BINDINGS),1)
 QMAKE_FLAGS+=IAITO_ENABLE_PYTHON_BINDINGS=true
 endif
-ifeq ($(WANT_CRASH_REPORTS),1)
-# QMAKE_FLAGS+=IAITO_ENABLE_CRASH_REPORTS=true
+ifeq ($(WANT_DEBUGGER),0)
+QMAKE_FLAGS+=IAITO_ENABLE_DEBUGGER=false
+else
+QMAKE_FLAGS+=IAITO_ENABLE_DEBUGGER=true
 endif
+ifeq ($(WANT_CRASH_REPORTS),1)
+QMAKE_FLAGS+=IAITO_ENABLE_CRASH_REPORTS=true
+endif
+QMAKE_FLAGS+=PREFIX=$(PREFIX)
+INDENT_IMAGE_NAME ?= clang-format-image
+INDENT_IMAGE_TAG ?= llvm20
+INDENT_IMAGE := $(INDENT_IMAGE_NAME):$(INDENT_IMAGE_TAG)
+INDENT_FILES := $(shell find src \( -name '*.cpp' -o -name '*.h' \))
+CLANG_FORMAT ?= clang-format-20
 
 all: iaito
 
-#-DIAITO_ENABLE_CRASH_REPORTS=ON
-cbuild:
-	mkdir -p cbuild
-	cd cbuild && cmake $(CMAKE_FLAGS) \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DIAITO_USE_BUNDLED_RADARE2=OFF \
-	-DIAITO_APPIMAGE_BUILD=ON \
-	-DCMAKE_INSTALL_PREFIX=appdir/usr \
-	../src
+CXX?=g++
+
+reset:
+	rm -rf ~/.config/radareorg/iaito.conf
+
+QTLIBS=$(shell grep "^LIBS" build/Makefile | cut -d = -f 2-)
+R2LIBS=$(shell pkg-config --cflags --libs r_core)
+R2_LIBEXT=$(shell r2 -H R2_LIBEXT)
+R2_USER_PLUGINS=$(shell r2 -H R2_USER_PLUGINS)
+
+plugin core_plugin: iaito
+	SUBLIBS=true $(CXX) build/*.o src/CorePlugin.cpp -shared -fPIC $(QTLIBS) $(R2LIBS) -o build/CorePlugin.$(R2_LIBEXT)
+	mkdir -p $(R2_USER_PLUGINS)
+	rm -f $(R2_USER_PLUGINS)/IaitoPlugin.$(R2_LIBEXT)
+	cp -f build/CorePlugin.$(R2_LIBEXT) $(R2_USER_PLUGINS)/IaitoPlugin.$(R2_LIBEXT)
+
+asan:
+	export CXXFLAGS=-fsanitize=address ; \
+	export CFLAGS=-fsanitize=address ; \
+	export LDFLAGS=-fsanitize=address ; \
+		$(MAKE) build && $(MAKE) -C build -j4
 
 clean:
-
-mrproper: clean
+	rm -f src/ui_*.h
+	rm -f src/moc_*
 	rm -rf build
 
-.PHONY: cmake install build run user-install clean mrproper translations
+dist:
+ifeq ($(shell uname),Darwin)
+	$(MAKE) -C dist/macos
+else
+	$(MAKE) -C dist/debian
+endif
 
-cmake: cbuild
-	$(MAKE)
+mrproper: clean
+	git clean -xdf
 
-iaito: translations
-	$(MAKE) -C build -j4
-
-translations: build src/translations/README.md
-	$(MAKE) -C src/translations
-#	lrelease src/Iaito.pro
-
-src/translations/README.md:
-	git submodule update --init
+.PHONY: install run user-install dist macos clean mrproper install-translations
+.PHONY: dockindent dockindent-image indent indent-host
+.PHONY: install-deeplink uninstall-deeplink
 
 # force qt5 build when QtCreator is installed in user's home
-ifeq ($(shell test -x ~/Qt/5.12.3/clang_64/bin/qmake || echo err),)
-QMAKE=~/Qt/5.12.3/clang_64/bin/qmake
+ifeq ($(shell test -x ~/Qt/5.*/clang_64/bin/qmake || echo err),)
+QMAKE=~/Qt/5.*/clang_64/bin/qmake
 endif
 
+iaito: build
+	$(MAKE) -C build
+
 build:
 	mkdir -p build
 	cd build && $(QMAKE) ../src/Iaito.pro $(QMAKE_FLAGS)
 
-install: translations
+install-man:
+	mkdir -p "${DESTDIR}${MANDIR}/man1"
+	for FILE in src/*.1 ; do ${INSTALL_MAN} "$$FILE" "${DESTDIR}${MANDIR}/man1" ; done
+
+install: build
 ifeq ($(shell uname),Darwin)
 	rm -rf $(DESTDIR)/Applications/iaito.app
 	mkdir -p $(DESTDIR)/Applications
 	cp -rf build/iaito.app $(DESTDIR)/Applications/iaito.app
-	mkdir -p $(DESTDIR)/usr/local/bin
-	ln -fs  '/Applications/iaito.app/Contents/MacOS/iaito' $(DESTDIR)'/usr/local/bin/iaito'
+	mkdir -p $(DESTDIR)/$(PREFIX)/bin
+	ln -fs  '/Applications/iaito.app/Contents/MacOS/iaito' $(DESTDIR)/$(PREFIX)'/bin/iaito'
 else
 	$(MAKE) -C build install INSTALL_ROOT=$(DESTDIR)
+	# Refresh the desktop DB so the .desktop MimeType registers iaito://
+	-update-desktop-database "$(DESTDIR)$(PREFIX)/share/applications" 2>/dev/null
 endif
-	$(MAKE) -C src/translations install
-	mkdir -p "$(DESTDIR)/$(PREFIX)/share/iaito/translations"
-	cp -f src/translations/build/*.qm "$(DESTDIR)/$(PREFIX)/share/iaito/translations"
+	$(MAKE) install-man
 
-user-install:
+uninstall:
+ifeq ($(shell uname),Darwin)
+	rm -rf $(DESTDIR)/Applications/iaito.app
+	rm -rf "$(DESTDIR)/$(PREFIX)/bin/iaito"
+else
+	rm -rf "$(DESTDIR)/$(PREFIX)/share/iaito"
+	rm -rf "$(DESTDIR)/$(PREFIX)/bin/iaito"
+endif
+	rm -f "${DESTDIR}$(MANDIR)/man1/iaito.1"
+	-$(MAKE) uninstall-deeplink
+
+user-install: build
+ifeq ($(shell uname),Darwin)
+	rm -rf ${HOME}/Applications/iaito.app
+	mkdir -p ${HOME}/Applications
+	cp -rf build/iaito.app ${HOME}/Applications/iaito.app
+else
+	$(MAKE) -C build install INSTALL_ROOT=/ PREFIX=${HOME}/.local
+endif
+	$(MAKE) install-man DESTDIR=/ PREFIX=${HOME}/.local MANDIR=${HOME}/.local/share/man
+	$(MAKE) install-deeplink
+
+user-uninstall:
+	$(MAKE) uninstall DESTDIR=/ PREFIX=${HOME}/.local MANDIR=${HOME}/.local/share/man
+
+ifneq ($(shell uname),Darwin)
+run: install-desktop-user
+endif
 
 run:
 	rarun2 libpath=$(shell r2 -H R2_LIBDIR) program=$(BIN)
+
+install-desktop-user:
+	@mkdir -p $(HOME)/.local/share/applications
+	@mkdir -p $(HOME)/.local/share/icons/hicolor/scalable/apps
+	@cp -f src/org.radare.iaito.desktop $(HOME)/.local/share/applications/org.radare.iaito.desktop
+	@cp -f src/img/org.radare.iaito.svg $(HOME)/.local/share/icons/hicolor/scalable/apps/org.radare.iaito.svg
+	@$(MAKE) install-deeplink
+
+# Register/unregister the iaito:// deep link URI scheme handler
+install-deeplink:
+ifeq ($(shell uname),Darwin)
+	sh scripts/deeplink/register.sh "$(DESTDIR)/Applications/iaito.app"
+else
+	sh scripts/deeplink/register.sh
+endif
+
+uninstall-deeplink:
+	sh scripts/deeplink/unregister.sh
+
+gdb:
+	gdb --args $(BIN)
+
+lldb:
+	lldb -- $(BIN)
+
+src/translations/README.md:
+	git clone https://github.com/radareorg/iaito-translations.git src/translations
+
+install-translations: src/translations/README.md
+	$(MAKE) -C src/translations install PREFIX="$(DESTDIR)/$(PREFIX)"
+
+user-install-translations: src/translations/README.md
+	$(MAKE) -C src/translations user-install
+
+dockindent:
+	$(MAKE) dockindent-image
+	docker run --rm -v "$$PWD:/project" $(INDENT_IMAGE) -i $(INDENT_FILES)
+
+dockindent-image:
+	docker image inspect $(INDENT_IMAGE) >/dev/null 2>&1 || \
+		$(MAKE) -C scripts/indent IMAGE_NAME=$(INDENT_IMAGE_NAME) IMAGE_TAG=$(INDENT_IMAGE_TAG)
+
+fmt format indent:
+	$(MAKE) dockindent
+
+indent-host:
+	$(CLANG_FORMAT) --version | grep 'version 20.'
+	$(CLANG_FORMAT) -i $(INDENT_FILES)

README.md

@@ -1,74 +1,143 @@
-<img width="150" height="150" align="left" style="float: left; margin: 0 10px 0 0;" alt="Iaito logo" src="https://raw.githubusercontent.com/radareorg/iaito/master/src/img/iaito-circle.svg?sanitize=true">
-
-# iaito
+# iaito: use radare2 with one hand!
 
 iaito is the official graphical interface for radare2, a libre reverse engineering framework.
 
-* Iaito was the original name of this GUI before being forked as Cutter.
-* It's written in Qt/C++ (qt5 for now). No Qt6 support yet
-* Support latest versions and features of radare2
-* Use r2 plugins (f.ex: no need for r2ghidra-iaito plugin if r2ghidra is installed)
-* Focus on parity of commands and r2-style workflows.
-* Translations are in the early steps, please [contribute](https://crowdin.com/project/iaito)!
-* Aims to support all the features from the core, not just disassembler-based ones
-  * forensics, networking, bindiffing, solvers, ...
+<img width="150" height="150" align="left" style="float: left; margin: 0 30px 0 0;" alt="Iaito logo" src="https://raw.githubusercontent.com/radareorg/iaito/master/src/img/iaito.svg?sanitize=true">
+
+* Based on radare2 and Qt-5/6
+* Iaito was the original name before being forked as Cutter.
+* Use all your favourite r2 plugins and scripts (nothing is specific to iaito)
+* Focus on simplicity, parity with commands, features, keybindings
+* Forensics, bindiffing, binary patching, .. not just a static disassembler
 
 [![Crowdin](https://badges.crowdin.net/iaito/localized.svg)](https://crowdin.com/project/iaito)
 [![iaito CI](https://github.com/radareorg/iaito/workflows/iaito%20CI/badge.svg)](https://github.com/radareorg/iaito/actions)
-[![Linux packages](https://repology.org/badge/vertical-allrepos/iaito.svg?columns=4)](https://repology.org/project/iaito/versions)
 
+![Screenshot](https://raw.githubusercontent.com/radareorg/iaito/master/screenshots/macos-panels.png)
+
+## Help
+
+Get help, updates, meet the community or discuss about development in these channels:
+
+- **Discord:** [https://radare.org/discord](https://radare.org/discord)
+- **Telegram:** https://t.me/radare
+- **Mastodon:** [@radareorg](https://infosec.exchange/@radareorg)
+- **Translations:** [crowdin](https://crowdin.com/project/iaito)!
 
-![Screenshot](https://raw.githubusercontent.com/radareorg/iaito/master/screenshot.png)
 
 ## Installation
 
 There are automated CI builds and [releases](https://github.com/radareorg/iaito/releases) of iaito for Linux, macOS and Windows.
 
+On WSL or Linux you can use these steps to install it with Flatpak:
+
+```sh
+sudo flatpak remote-add flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+sudo flatpak install flathub org.radare.iaito
+flatpak run org.radare.iaito
+```
+
+On macOS, you may want to fix the signature
+
+```sh
+sudo xattr -c /Applications/iaito.app
+sudo codesign --force --deep --sign - /Applications/iaito.app
+```
+
+<a href='https://flathub.org/apps/details/org.radare.iaito'><img width='120' alt='Download on Flathub' src='https://flathub.org/assets/badges/flathub-badge-en.png'/></a>
+
 ## Source Builds
 
 ### Dependencies
 
-iaito requires [radare2](https://github.com/radareorg/radare2) and qt5:
+iaito requires [radare2](https://github.com/radareorg/radare2) and qt5 (or qt6):
 
-```
-$ git clone https://github.com/radareorg/radare2
-$ radare2/sys/install.sh
+```sh
+$ git clone https://github.com/radareorg/radare2 && radare2/sys/install.sh
 ```
 
 Install QT on macOS like this:
 
-```
+```sh
 brew install qt@5
 echo 'export PATH="/opt/homebrew/opt/qt@5/bin:$PATH"' >> ~/.profile
 ```
 
 On Ubuntu/Debian
 
-```
+```sh
 sudo apt install qttools5-dev qttools5-dev-tools qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools libqt5svg5-dev make pkg-config build-essential
 ```
 
-## Building from sources
+For QT6:
 
+```sh
+sudo apt install qt6-svg-dev
 ```
+
+### Compilation
+
+```sh
 ./configure
 make
 make run
 ```
 
-To install the app and the translations in your home:
+On macOS, `make run` launches the app from `build/iaito.app` without installing it.
+Registering the `iaito://` URI handler is optional; see [deep links](doc/deeplinks.md#macos).
 
-```
+To install the app in your home:
+
+```sh
 make install
 ```
 
-## Plugins
-iaito supports both Python and Native C++ plugins. For now the api is compatible with Iaito. Read the [Plugins](https://cutter.re/docs/plugins) section on their documentation.
+### Building iaito as an r2 plugin
 
-## Help
+It is also possible to launch iaito from the r2 shell reusing the Core instance:
 
-Get help, updates, meet the community or discuss about development in these channels:
+```
+make plugin
+```
 
-- **Telegram:** https://t.me/radare
-- **IRC:** #radare on irc.freenode.net
-- **Twitter:** [@radareorg](https://twitter.com/radareorg)
+The previous command will build iaito, the iaito plugin and copy it it into your home plugin directory.
+
+```
+$ r2 /bin/ls
+> iaito
+...
+```
+
+### Translations (Optional)
+
+Note: The flatpak/flathub version already ships the translations as an optional extension.
+
+To install translations please download latest version from [iaito-translations](https://github.com/radareorg/iaito-translations) repo.
+
+To install in your home directory, run the following:
+
+```sh
+$ git clone https://github.com/radareorg/iaito-translations.git
+$ cd iaito-translations
+$ make user-install
+```
+
+Alternatively, it this project makefile can be used to install them:
+
+```sh
+$ make user-install-translations
+OR
+$ make install-translations # to install to system
+```
+
+### Binaries
+
+Most distros may Checkout the [Releases](https://github.com/radareorg/iaito/releases) page to download the build for Linux, macOS or Windows, and read the notes in case of problems!
+
+As shown below, most distros are packaging iaito already, pick the build you like the most!
+
+[![Linux packages](https://repology.org/badge/vertical-allrepos/iaito.svg?columns=4)](https://repology.org/project/iaito/versions)
+
+Snap:
+
+[![iaito snap](https://snapcraft.io/iaito/badge.svg)](https://snapcraft.io/iaito)

autogen.sh

@@ -24,7 +24,7 @@ else
 	acr -p
 fi
 
-. configure
+. ./configure
 
 sed \
 	-e "s,^IAITO_VERSION_MAJOR.*,IAITO_VERSION_MAJOR = ${VERSION_MAJOR}," \
@@ -34,7 +34,10 @@ sed \
 
 mv src/Iaito.pro.sed src/Iaito.pro
 ${EDITOR} .github/workflows/ci.yml
-
+echo
+echo "Press enter and add a new changelog entry for the new Flatpak version"
+read A
+${EDITOR} src/org.radare.iaito.appdata.xml
 #V=`./configure -qV | cut -d - -f -1`
 # meson rewrite kwargs set project / version "$V"
 # if [ -n "$1" ]; then

build.sh

@@ -1,121 +0,0 @@
-#!/bin/sh
-
-# This script is a work in progress
-
-####   Constants    ####
-ERR=0
-
-#### User variables ####
-BUILD="$(pwd)/build"
-QMAKE_CONF=$*
-ROOT_DIR=$(pwd)
-
-check_r2() {
-	r2 -v >/dev/null 2>&1
-	if [ $? = 0 ]; then
-		R2COMMIT=$(r2 -v | tail -n1 | sed "s,commit: \\(.*\\) build.*,\\1,")
-		SUBMODULE=$(git submodule | grep "radare2" | awk '{print $1}')
-		if [ "$R2COMMIT" = "$SUBMODULE" ]; then
-			return 0
-		fi
-			return 0
-	fi
-	return 1
-}
-
-find_qmake() {
-	qmakepath=$(command -v qmake-qt5)
-	if [ -z "$qmakepath" ]; then
-		qmakepath=$(command -v qmake)
-	fi
-	if [ -z "$qmakepath" ]; then
-		echo "You need qmake to build Iaito."
-		echo "Please make sure qmake is in your PATH environment variable."
-		exit 1
-	fi
-	echo "$qmakepath"
-}
-
-find_lrelease() {
-	lreleasepath=$(command -v lrelease-qt5)
-	if [ -z "$lreleasepath" ]; then
-		lreleasepath=$(command -v lrelease)
-	fi
-	if [ -z "$lreleasepath" ]; then
-		echo "You need lrelease to build Iaito."
-		echo "Please make sure lrelease is in your PATH environment variable."
-		exit 1
-	fi
-	echo "$lreleasepath"
-}
-
-find_gmake() {
-	gmakepath=$(command -v gmake)
-	if [ -z "$gmakepath" ]; then
-		gmakepath=$(command -v make)
-	fi
-
-	${gmakepath} --help 2>&1 | grep -q gnu
-	if [ $? != 0 ]; then
-		echo "You need GNU make to build Iaito."
-		echo "Please make sure gmake is in your PATH environment variable."
-		exit 1
-	fi
-	echo "$gmakepath"
-}
-
-prepare_breakpad() {
-    OS="$(uname -s)"
-	if [ -z "$OS" ]; then
-		echo "Could not identify OS, OSTYPE var is empty. You can try to disable breakpad to avoid this error."
-		exit 1
-	fi
-
-	if [ "$OS" = "Linux" ]; then
-		. $ROOT_DIR/scripts/prepare_breakpad_linux.sh
-		export PKG_CONFIG_PATH="$CUSTOM_BREAKPAD_PREFIX/lib/pkgconfig:$PKG_CONFIG_PATH"
-	elif [ "$OS" = "Darwin" ]; then
-		. $ROOT_DIR/scripts/prepare_breakpad_macos.sh
-	fi
-}
-
-# Build radare2
-bash build_radare2.sh || exit 1
-
-# Create translations
-$(find_lrelease) ./src/Iaito.pro
-
-# Build
-if [ "${QMAKE_CONF#*IAITO_ENABLE_CRASH_REPORTS=true}" != "$QMAKE_CONF" ]; then
-	prepare_breakpad
-fi
-mkdir -p "$BUILD"
-cd "$BUILD" || exit 1
-$(find_qmake) ../src/Iaito.pro "$QMAKE_CONF"
-$(find_gmake) -j4
-ERR=$((ERR+$?))
-
-# Move translations
-mkdir -p "$(pwd)/translations"
-find "$ROOT_DIR/src/translations" -maxdepth 1  -type f | grep "cutter_..\.qm" | while read -r SRC_FILE; do
-    mv "$SRC_FILE" "$(pwd)/translations"
-done
-
-# Finish
-if [ ${ERR} -gt 0 ]; then
-    echo "Something went wrong!"
-else
-    echo "Build complete."
-	printf "This build of Iaito will be installed. Do you agree? [Y/n] "
-    read -r answer
-    if [ -z "$answer" ] || [ "$answer" = "Y" ] || [ "$answer" = "y" ]; then
-		$(find_gmake) install
-	else
-		echo "Binary available at $BUILD/iaito"
-	fi
-  if [ -x '/usr/local/bin/iaito.app/Contents/MacOS/iaito' ]; then
-    ln -fs  '/usr/local/bin/iaito.app/Contents/MacOS/iaito' '/usr/local/bin/iaito'
-  fi
-fi
-
-cd ..

build_radare2.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-r2 -v >/dev/null 2>&1
-if [ $? -eq 0 ]; then
-  echo "Correct radare2 version found, skipping..."
-  exit 0
-fi
-
-printf "A (new?) version of radare2 will be installed. Do you agree? [Y/n] "
-read -r answer
-case "$answer" in
-""|y|Y)
-  R2PREFIX=${1:-"/usr"}
-  if [ ! -d "./radare2" ]; then
-    git clone --recurse-submodules https://github.com/radareorg/radare2
-  fi
-  cd radare2 || exit 1
-  ./sys/install.sh "$R2PREFIX"
-  cd ..
-  ;;
-*)
-  echo "Sorry but you can't move forward without r2 installed"
-  exit 1
-esac

config.mk.acr

@@ -1,7 +1,10 @@
 PREFIX=@PREFIX@
-QMAKE=@QMAKE@
-LRELEASE=@LRELEASE@
+QMAKE=@QMAKE_BIN@
 
-WANT_PYTHON=@WANT_PYTHON@
-WANT_PYTHON_BINDINGS=@WANT_PYTHON_BINDINGS@
 WANT_CRASH_REPORTS=@WANT_CRASH_REPORTS@
+WANT_DEBUGGER=@WANT_DEBUGGER@
+
+DESTDIR?=
+MANDIR=@MANDIR@
+INSTALL=@INSTALL@
+INSTALL_MAN=@INSTALL_MAN@

configure

@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was automatically generated by ACR v2.0.0
+# This script was automatically generated by ACR v2.2.8
 # @author: pancake <nopcode.org>
 # @url:    http://www.nopcode.org
 # @repo:   git clone https://github.com/radare/acr
@@ -18,9 +18,9 @@ control_c() {
   exit 1
 }
 trap control_c 2
-WANT_PYTHON=0
-WANT_PYTHON_BINDINGS=0
+WANT_QMAKE6=0
 WANT_CRASH_REPORTS=0
+WANT_DEBUGGER=1
 split_host() {
 S="$"
 while : ; do
@@ -68,13 +68,27 @@ if [ -e "${VPATH}/config.guess" ]; then
 	sh ${VPATH}/config.guess
 	return
 fi
-CPU="`uname -m|sed -e 's, ,,g'|cut -d - -f 1`"
+CPU="`uname -m | tr 'A-Z' 'a-z' | sed -e 's, ,,g' | cut -d - -f 1`"
 OS="`uname -s|tr A-Z a-z`"
 uname -r | grep -qE "(Microsoft|WSL)" 2>/dev/null && OS="wsl"
 GNU="`uname --help 2>&1 | grep gnu`"
 [ "${GNU}" ] && OS="${OS}-gnu"
-[ "${CPU}" = ppc ] && CPU="powerpc"
-echo "${CPU}-unknown-${OS}"
+# normalize CPU
+case "${CPU}" in
+	ppc*|powermac*|powermacintosh*|powerpc*)
+		if echo "${CPU}" | grep -q '64'; then
+			CPU=powerpc64
+		else
+			CPU=powerpc
+		fi
+		;;
+	*) ;;
+esac
+VENDOR="unknown"
+if [ "${OS}" = "darwin" ]; then
+	VENDOR=apple
+fi
+echo "${CPU}-${VENDOR}-${OS}"
 }
 
 SEARCHPATH="/usr /usr/local /usr/pkg /sw"
@@ -86,6 +100,7 @@ HOST="${BUILD}"
 TARGET="${HOST}"
 ETCDIR="/etc"
 SYSCONFDIR=""
+DESCRIPTION=""
 
 create_environ() {
 : ${EPREFIX:="${PREFIX}"}
@@ -94,6 +109,8 @@ create_environ() {
 : ${SBINDIR:="${PREFIX}/sbin"}
 : ${ETCDIR:="${SPREFIX}/etc"}
 : ${LIBDIR:="${SPREFIX}/lib"}
+: ${PKGCFG_LIBDIR:='${exec_prefix}/lib'}
+: ${PKGCFG_INCDIR:='${prefix}/include'}
 : ${LIBEXECDIR:="${SPREFIX}/libexec"}
 : ${INCLUDEDIR:="${SPREFIX}/include"}
 : ${DATADIR:="${SPREFIX}/share"}
@@ -112,12 +129,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='iaito' ; VERSION='5.7.0' ; VERSION_MAJOR=5; VERSION_MINOR=7; VERSION_PATCH=0; VERSION_NUMBER=50700; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
+ PKGNAME='iaito' ; VERSION='6.2.6' ; VERSION_MAJOR=6; VERSION_MINOR=2; VERSION_PATCH=6; VERSION_NUMBER=60206; CONTACT_MAIL="[email protected]" ; CONTACT_NAME="pancake" ; CONTACT="pancake <[email protected]>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures iaito-5.7.0 to adapt to many kinds of systems.
+'configure' configures iaito-6.2.6 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -161,10 +178,9 @@ EOF2
 
 printf "
 Optional Features:
-  --with-python          build with support for Python
-  --with-python-bindings
-                          build with Python bindings
+  --with-qmake6          ignore qmake in path when qmake6 is found
   --with-crash-reports   handle crashes nicely
+  --without-debugger     native support for debugging
 "
 printf "
 Some influential environment variables:
@@ -196,10 +212,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "5.7.0"
+	echo "6.2.6"
 	exit 0
 fi
-echo "iaito-5.7.0 configuration script done with acr v2.0.0.
+echo "iaito-6.2.6 configuration script done with acr v2.2.8.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -227,11 +243,13 @@ case $flag in
 -V|-version|--version)
 	show_version ; ;;
 -r|--r|--report)
-echo "PKGNAME:   iaito"
-echo "VERSION:   5.7.0"
-echo "LANGS:     c++"
-echo "PKG-CONFIG:  r_core"
-echo "FLAGS:     --with-python --with-python-bindings --with-crash-reports"
+echo "PKGNAME:     iaito"
+echo "VERSION:     6.2.6"
+echo "AUTHOR:      pancake"
+echo "EMAIL:       pancake@nopcode.org"
+echo "LANGS:       c++"
+echo "PKGCONFIG:   r_core"
+echo "FLAGS:       --with-qmake6 --with-crash-reports --without-debugger"
 	exit 0
 	;;
 --cache-file)
@@ -271,19 +289,21 @@ echo "FLAGS:     --with-python --with-python-bindings --with-crash-reports"
 --localstatedir)
 	LOCALSTATEDIR="$value"; ;;
 --libdir)
-	LIBDIR="$value"; ;;
+	LIBDIR="$value"
+	PKGCFG_LIBDIR="$value"; ;;
 --libpath)
 	LDFLAGS="${LDFLAGS} ${LIBPATH}$value"; ;;
 --includedir)
+	PKGCFG_INCDIR="$value"
 	INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;;
 --infodir)
 	INFODIR="$value"; ;;
 --mandir)
 	MANDIR="$value"; ;;
 
-"--with-python") WANT_PYTHON="1"; ;;
-"--with-python-bindings") WANT_PYTHON_BINDINGS="1"; ;;
+"--with-qmake6") WANT_QMAKE6="1"; ;;
 "--with-crash-reports") WANT_CRASH_REPORTS="1"; ;;
+"--without-debugger") WANT_DEBUGGER="0"; ;;
 *) if [ "$value" ]; then eval "`echo $flag2=$value`" ;
 else echo ; echo "WARNING: Unknown flag '$flag'." >&2 ; echo ; fi ;;
 esac
@@ -301,7 +321,7 @@ parse_options "$1"
 shift
 done
 
-ENVWORDS="MANDIR INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CXX CXXFLAGS LDFLAGS HAVE_LANG_CXX CPP PKGCONFIG HAVE_R2 R2 R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE HAVE_QMAKE QMAKE HAVE_LRELEASE LRELEASE WANT_PYTHON WANT_PYTHON_BINDINGS WANT_CRASH_REPORTS"
+ENVWORDS="MANDIR DESCRIPTION INFODIR LIBDIR INCLUDEDIR LOCALSTATEDIR ETCDIR SYSCONFDIR DATADIR DOCDIR LIBEXECDIR SBINDIR BINDIR EPREFIX PREFIX SPREFIX TARGET HOST BUILD INSTALL INSTALL_LIB INSTALL_MAN INSTALL_PROGRAM INSTALL_PROGRAM_STRIP INSTALL_DIR INSTALL_SCRIPT INSTALL_DATA HOST_OS HOST_CPU BUILD_OS BUILD_CPU TARGET_OS TARGET_CPU VERSION VERSION_MAJOR VERSION_MINOR VERSION_PATCH VERSION_NUMBER PKGCFG_LIBDIR PKGCFG_INCDIR PKGNAME VPATH CONTACT CONTACT_NAME CONTACT_MAIL CXX CXXFLAGS LDFLAGS HAVE_LANG_CXX CPP PKGCONFIG HAVE_R2 R2 R2_CFLAGS R2_LDFLAGS HAVE_PKGCFG_R_CORE HAVE_QMAKE QMAKE HAVE_QMAKE6 QMAKE6 WANT_QMAKE6 QMAKE_BIN WANT_CRASH_REPORTS WANT_DEBUGGER"
 
 create_environ
 
@@ -316,8 +336,6 @@ ocho "checking for working directories... ${WODIS}"
 ocho "using prefix '${PREFIX}'"
 ACR_RMFILES=" test.c test.cxx a.out a.exe"
 	
-
-
 COMPILER=CXX
 HAVE_LANG_CXX=1
 ochof "checking for c++ compiler... "
@@ -345,6 +363,7 @@ exit 1
 	if [ 0 = 0 ]; then echo ${CPP}; else
 	echo "ERROR: ${CPP} cannot parse sources"; fi
 ochof "checking for pkg-config... "
+ENVWORDS="${ENVWORDS} HAVE_PKGCONFIG"
 if [ -n "$PKGCONFIG" ]; then
 	if [ -x "$PKGCONFIG" ]; then
 		_HAVE_PKGCONFIG="${PKGCONFIG}"
@@ -368,7 +387,9 @@ else
 fi
 if [ -n "${PKGCONFIG}" ]; then
 	ocho ${PKGCONFIG}
+	HAVE_PKGCONFIG=1
 else
+	HAVE_PKGCONFIG=0
 	echo "Cannot find pkg-config or pkgconf in PATH" >&2
 	exit 1
 ocho no; fi
@@ -440,18 +461,16 @@ if [ "" = 1 ]; then
 echo "Cannot find qmake" >&2
 else
 echo no
-fi
-	echo "error: This program is required." >&2
-	exit 1 ; fi
-ochof "checking for lrelease... "
-if [ -x "${LRELEASE}" ]; then
-	FIND=${LRELEASE}
+fi ; fi
+ochof "checking for qmake6... "
+if [ -x "${QMAKE6}" ]; then
+	FIND=${QMAKE6}
 else
 	FIND=""
 	IFS=:
 	for A in ${PATH} ; do
-		if [ -x "${A}/lrelease" ]; then
-			FIND="${A}/lrelease"
+		if [ -x "${A}/qmake6" ]; then
+			FIND="${A}/qmake6"
 			break;
 		fi
 	done
@@ -459,25 +478,41 @@ else
 fi
 if [ -n "${FIND}" ]; then
 	ocho ${FIND};
-HAVE_LRELEASE=1
-	LRELEASE=${FIND}
+HAVE_QMAKE6=1
+	QMAKE6=${FIND}
 else
-	HAVE_LRELEASE=0
-	LRELEASE=lrelease
+	HAVE_QMAKE6=0
+	QMAKE6=qmake6
 if [ "" = 1 ]; then
-echo "Cannot find lrelease" >&2
+echo "Cannot find qmake6" >&2
 else
 echo no
-fi
-	echo "error: This program is required." >&2
-	exit 1 ; fi
+fi ; fi
+if [ "$WANT_QMAKE6" = "1" ]; then
+if [ "$HAVE_QMAKE6" = "1" ]; then
+QMAKE_BIN="${QMAKE6}"
+else
+case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake6" >&2 ; echo ; exit 1 ;; esac; fi
+else
+if [ "$HAVE_QMAKE" = "1" ]; then
+QMAKE_BIN="${QMAKE}"; fi; fi
+if [ "$QMAKE_BIN" = """" ]; then
+case "$undefined_variable" in 0|"") echo ; echo "ERROR: Missing qmake" >&2 ; echo ; exit 1 ;; esac; fi
+WANT_CRASH_REPORTS="0"
 SEDFLAGS=" -e '"
 COUNT=0
 for A in ${ENVWORDS} ; do
 	[ "${A}" = VPATH ] && continue
 	[ "${A}" = srcdir ] && continue
 	eval "VAR=\$${A}"
-	VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+	case "" in
+	mingw*|cygwin*|msys*)
+		VAR="`echo ${VAR} | sed -e 's/\\/\\\\/g' -e 's/\,/\\\,/g'`"
+		;;
+	*)
+		VAR="`echo ${VAR} | sed -e 's/\,/\\\,/g'`"
+		;;
+	esac
 	[ $COUNT = 10 ] && COUNT=0 && SEDFLAGS="${SEDFLAGS}' -e '"
 	COUNT=$(($COUNT+1))
 	SEDFLAGS="${SEDFLAGS}s,@${A}@,${VAR},g;"
@@ -515,3 +550,12 @@ done
 done
 
 do_remove
+if [ "$QUIET" = 0 ]; then
+echo
+echo "Final report:"
+for A in  R2 QMAKE_BIN ; do
+eval VAL="\$${A}"
+[ -z "${VAL}" ] && VAL="\"\""
+echo " - ${A} = ${VAL}"
+done
+fi

configure.acr

@@ -1,5 +1,5 @@
 PKGNAME iaito
-VERSION 5.7.0
+VERSION 6.2.6
 CONTACT pancake ; [email protected]
 
 LANG_CXX!
@@ -7,11 +7,34 @@ LANG_CXX!
 USE_PKGCONFIG!
 CHKPRG! R2 r2
 PKGCFG! R2_CFLAGS R2_LDFLAGS r_core
-CHKPRG! QMAKE qmake
-CHKPRG! LRELEASE lrelease
+CHKPRG QMAKE qmake
+CHKPRG QMAKE6 qmake6
+(( CHKPRG! LRELEASE lrelease )) 
+
+ARG_WITH WANT_QMAKE6 qmake6 ignore qmake in path when qmake6 is found ;
+
+IFEQ WANT_QMAKE6 1 ; {
+        IFEQ HAVE_QMAKE6 1 ; {
+                QMAKE_BIN = ${QMAKE6} ;
+        }{
+                DIENOW Missing qmake6 ;
+        }
+}{
+        IFEQ HAVE_QMAKE 1 ; {
+        QMAKE_BIN = ${QMAKE} ;
+        }
+
+}
+
+IFEQ QMAKE_BIN "" ; {
+        DIENOW Missing qmake ;
+}
+
+WANT_CRASH_REPORTS = 0 ;
 
-ARG_WITH WANT_PYTHON python build with support for Python ;
-ARG_WITH WANT_PYTHON_BINDINGS python-bindings build with Python bindings ;
 ARG_WITH WANT_CRASH_REPORTS crash-reports handle crashes nicely ;
+ARG_WITHOUT WANT_DEBUGGER debugger native support for debugging ;
 
 SUBDIRS config.mk ;
+
+REPORT R2 QMAKE_BIN ;

configure.bat

@@ -10,14 +10,21 @@ IF !ERRORLEVEL! NEQ 0 (
     EXIT /B 1
 )
 
-SET "R2DIST=r2_dist"
+SET "R2DIR=radare2"
 SET "BUILDDIR=build_%PLATFORM%"
 
 
 ECHO Prepare translations
+IF NOT EXIST "src\translations\NUL" (
+    git clone https://github.com/radareorg/iaito-translations.git src/translations
+)
 FOR %%i in (src\translations\*.ts) DO lrelease %%i
 
 ECHO Preparing directory
+rem MOVE radare2 %R2DIR%
+IF NOT EXIST %BUILDDIR% (
+MKDIR %BUILDDIR%
+)
 CD %BUILDDIR%
 
 IF NOT DEFINED IAITO_ENABLE_CRASH_REPORTS (
@@ -26,4 +33,5 @@ SET "IAITO_ENABLE_CRASH_REPORTS=false"
 
 ECHO Building iaito
 qmake BREAKPAD_SOURCE_DIR=%BREAKPAD_SOURCE_DIR% IAITO_ENABLE_CRASH_REPORTS=%IAITO_ENABLE_CRASH_REPORTS% %* ..\src\iaito.pro -config release
+COPY iaito_resource.rc ..\src
 IF !ERRORLEVEL! NEQ 0 EXIT /B 1

dist/CMakeLists.txt

@@ -1,138 +0,0 @@
-set(IAITO_DEPS "${CMAKE_CURRENT_SOURCE_DIR}/../cutter-deps")
-unset(RZ_GHIDRA_PREFIX_PATH)
-
-################################################
-# Windows
-################################################
-
-if(WIN32)
-	set(CPACK_GENERATOR "ZIP")
-	set(RIZIN_INSTALL_PLUGDIR "lib/plugins")
-
-	if (IAITO_PACKAGE_DEPENDENCIES)
-		if (IAITO_ENABLE_PYTHON)
-			if (IAITO_ENABLE_DEPENDENCY_DOWNLOADS)
-				set(CPACK_INSTALL_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/WindowsBundlePython.cmake)
-			endif()
-			find_package(PythonInterp REQUIRED)
-			install(DIRECTORY ${IAITO_DEPS}/pyside/lib/site-packages DESTINATION "python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}")
-			install(FILES ${IAITO_DEPS}/pyside/bin/shiboken2.abi3.dll ${IAITO_DEPS}/pyside/bin/pyside2.abi3.dll DESTINATION .)
-		endif()
-		install(SCRIPT WindowsBundleQt.cmake)
-	endif()
-	if (IAITO_PACKAGE_R2DEC AND IAITO_ENABLE_DEPENDENCY_DOWNLOADS)
-		install(CODE "
-			set(ENV{RZ_ALT_SRC_DIR} 1)
-			set(ENV{PATH} \"\${CMAKE_INSTALL_PREFIX};\$ENV{PATH}\")
-			execute_process(COMMAND powershell \"${CMAKE_CURRENT_SOURCE_DIR}/bundle_r2dec.ps1\" \"\${CMAKE_INSTALL_PREFIX}\"
-							WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-							RESULT_VARIABLE SCRIPT_RESULT)
-			if (SCRIPT_RESULT)
-				message(FATAL_ERROR \"Failed to package r2dec\")
-			endif()
-		")
-	endif()
-endif()
-
-################################################
-# macOS
-################################################
-
-if(APPLE)
-	set(CPACK_GENERATOR "Bundle")
-	set(CPACK_BUNDLE_NAME "iaito")
-	set(ICON "iaito")
-	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/macos/Info.plist")
-	set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/macos/Info.plist")
-	set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/macos/cutter.icns")
-	set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/macos/cutter_mac_app.png")
-	set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/macos/DS_Store_ForDMGBackground")
-
-	
-	find_program(MACDEPLOYQT_PATH macdeployqt HINTS "${Qt5_DIR}/../../../bin")
-	if(NOT MACDEPLOYQT_PATH)
-		message(FATAL_ERROR "Failed to find macdeployqt")
-	endif()
-
-	unset(ADJUST_RIZIN_LIBS)
-	foreach(_lib ${RZ_LIBS})
-		list(APPEND ADJUST_RIZIN_LIBS "${RIZIN_INSTALL_DIR}/lib/lib${_lib}.dylib")
-	endforeach()
-
-	if(IAITO_PACKAGE_DEPENDENCIES AND IAITO_ENABLE_PYTHON)
-		set(EMBED_PYTHON_SH "${CMAKE_CURRENT_SOURCE_DIR}/appbundle_embed_python.sh")
-		set(PYTHON_FRAMEWORK_DIR "${IAITO_DEPS}/python/Python.framework")
-		set(PYSIDE_PREFIX "${IAITO_DEPS}/pyside")
-		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MacOSBundlePython.cmake.in"
-			"${CMAKE_CURRENT_BINARY_DIR}/MacOSBundlePython.cmake" @ONLY)
-		install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/MacOSBundlePython.cmake")
-	endif()
-
-	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/MacOSSetupBundle.cmake.in"
-		"${CMAKE_CURRENT_BINARY_DIR}/MacOSSetupBundle.cmake" @ONLY)
-	install(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/MacOSSetupBundle.cmake")
-
-	get_filename_component(QT_PREFIX "${MACDEPLOYQT_PATH}/../.." ABSOLUTE)
-	list(APPEND RZ_GHIDRA_PREFIX_PATH "${QT_PREFIX}")
-	set(RIZIN_INSTALL_PLUGDIR "share/rizin/plugins") # escaped backslash on purpose, should be evaluated later
-
-    
-endif()
-
-################################################
-# rz-ghidra
-################################################
-
-if(IAITO_PACKAGE_RZ_GHIDRA)
-	if(IAITO_ENABLE_DEPENDENCY_DOWNLOADS)
-		# Currently using external project only for downloading source
-		# It neeeds to link against compiled cutter so for now build it using custom install script.
-		# That way rz-ghidra build process is the same as with any other external plugin built against
-		# installed Iaito.
-		ExternalProject_Add(rz-ghidra
-			GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra
-			GIT_TAG master
-			CONFIGURE_COMMAND ""
-			BUILD_COMMAND ""
-			INSTALL_COMMAND ""
-		)
-	endif()
-	if (WIN32)
-		set (GHIDRA_OPTIONS "
-			\"-DRIZIN_INSTALL_PLUGDIR=\${CMAKE_INSTALL_PREFIX}/${RIZIN_INSTALL_PLUGDIR}\"
-			-DIAITO_INSTALL_PLUGDIR=plugins/native")
-	elseif (APPLE)
-		set (GHIDRA_OPTIONS "
-			\"-DRIZIN_INSTALL_PLUGDIR=\${CMAKE_INSTALL_PREFIX}/${RIZIN_INSTALL_PLUGDIR}\"
-			-DIAITO_INSTALL_PLUGDIR=plugins/native")
-	else()
-		set (GHIDRA_OPTIONS "")
-	endif()
-	install(CODE "
-		execute_process(
-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rz-ghidra-prefix/src/rz-ghidra-build
-			RESULT_VARIABLE SCRIPT_RESULT
-			COMMAND \${CMAKE_COMMAND} 
-							../rz-ghidra
-							-DCMAKE_BUILD_TYPE=Release
-							\"-DCMAKE_PREFIX_PATH=\${CMAKE_INSTALL_PREFIX};\${CMAKE_INSTALL_PREFIX}/include/librz;\${CMAKE_INSTALL_PREFIX}/include/librz/sdb;${RZ_GHIDRA_PREFIX_PATH}\"
-							-DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX}
-							${GHIDRA_OPTIONS}
-							-DBUILD_IAITO_PLUGIN=ON
-							-DBUILD_SLEIGH_PLUGIN=OFF
-							-G Ninja
-			)
-		if (SCRIPT_RESULT)
-			message(FATAL_ERROR \"Failed to configure rz-ghidra\")
-		endif()
-		execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/rz-ghidra-prefix/src/rz-ghidra-build
-			RESULT_VARIABLE SCRIPT_RESULT
-			COMMAND \${CMAKE_COMMAND} --build . --target install
-			)
-		if (SCRIPT_RESULT)
-			message(FATAL_ERROR \"Failed to install rz-ghidra plugin\")
-		endif()
-	")
-endif()
-
-include(CPack)

dist/MacOSBundlePython.cmake.in

@@ -1,20 +0,0 @@
-
-set(EMBED_PYTHON_SH "@EMBED_PYTHON_SH@")
-set(PYTHON_FRAMEWORK_DIR "@PYTHON_FRAMEWORK_DIR@")
-set(PYSIDE_PREFIX "@PYSIDE_PREFIX@")
-
-get_filename_component(BUNDLE_PATH "${CMAKE_INSTALL_PREFIX}/../.." ABSOLUTE)
-
-set(ENV{PKG_CONFIG_PATH} "${PYSIDE_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
-
-# TODO: instead of calling a shellscript, implement the whole thing in cmake
-execute_process(COMMAND
-	"${EMBED_PYTHON_SH}"
-	"${PYTHON_FRAMEWORK_DIR}"
-	"${BUNDLE_PATH}"
-	"${BUNDLE_PATH}/Contents/MacOS/Iaito"
-    RESULT_VARIABLE SCRIPT_RESULT)
-if(SCRIPT_RESULT)
-    message(FATAL_ERROR "Failed to bundle python")
-endif()
-

dist/MacOSSetupBundle.cmake.in

@@ -6,7 +6,6 @@ set(ADJUST_RIZIN_LIBS "@ADJUST_RIZIN_LIBS@")
 set(IAITO_ENABLE_CRASH_REPORTS "@IAITO_ENABLE_CRASH_REPORTS@")
 set(Breakpad_LINK_LIBRARIES "@Breakpad_LINK_LIBRARIES@")
 set(IAITO_PACKAGE_DEPENDENCIES "@IAITO_PACKAGE_DEPENDENCIES@")
-set(IAITO_ENABLE_PYTHON "@IAITO_ENABLE_PYTHON@")
 
 macro(run_or_die)
 	execute_process(${ARGV} RESULT_VARIABLE PROC_RESULT)
@@ -65,13 +64,7 @@ run_or_die(COMMAND install_name_tool
 set(MACDEPLOYQT_COMMAND "${MACDEPLOYQT_PATH}" "${BUNDLE_PATH}" "-verbose=2" "-libpath=${CMAKE_INSTALL_PREFIX}/lib")
 message("Running macdeployqt \"${MACDEPLOYQT_COMMAND}\"")
 run_or_die(COMMAND ${MACDEPLOYQT_COMMAND}) # First run
-if (IAITO_PACKAGE_DEPENDENCIES AND IAITO_ENABLE_PYTHON)
-	file(REAL_PATH "${FRAMEWORK_DIR}/Python.framework/Python" _python_lib_path)
-	message("Python lib ${_python_lib_path}")
-	list(APPEND MACDEPLOYQT_COMMAND "-executable=${_python_lib_path}")
-endif()
-# Qt plugins are not getting deployed on first macdeployqt run. Runing twice helps.
-# If python is added as additional executable in first run it also breaks plugin copying.
+# Qt plugins are not getting deployed on first macdeployqt run. Running twice helps.
 run_or_die(COMMAND ${MACDEPLOYQT_COMMAND}) # Second run
 
 # Clean up the mess that macdeployqt made (duplicate rz libs, we only want the ones in the prefix)

dist/debian/CONFIG

@@ -1,7 +1,7 @@
 NAME=iaito
 SECTION=editors
 PRIORITY=optional
-DEPENDS=qt5-default libqt5svg5
+DEPENDS=$(shell ../getpkgversions.sh radare2), libqt6core6 (>= 6.2.4), libqt6gui6 (>= 6.2.4), libqt6widgets6 (>= 6.2.4), libqt6network6 (>= 6.2.4), libqt6svg6 (>= 6.2.4), libqt6svgwidgets6 (>= 6.2.4), qt6-qpa-plugins (>= 6.2.4)
 MAINTAINER=pancake <[email protected]>
 ARCH?=amd64
 VERSION=$(shell ../../../configure -qV)

dist/debian/getpkgversions.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+for pkg in "$@"
+do
+  VERSION=$(apt show $pkg 2> /dev/null | grep -F "Version: " | sed -e 's/Version:\s\([[[:digit:]\.]\+\).*/\1/')
+  if [ $pkg != $1 ]; then
+    echo -n ", "
+  fi
+  echo -n "$pkg (>= $VERSION)"
+done

dist/debian/iaito/Makefile

@@ -1,6 +1,5 @@
 PACKAGE_DIR=$(shell pwd)
 include ./CONFIG
-DEPENDS=
 
 SUDO=fakeroot
 SUDO=sudo
@@ -19,7 +18,7 @@ all:
 	$(MAKE) deb
 
 root:
-	cd ../../.. && $(MAKE) && $(MAKE) install PREFIX=/usr DESTDIR=/tmp/iaito-deb
+	cd ../../.. && $(MAKE) && $(MAKE) install install-translations PREFIX=/usr DESTDIR=/tmp/iaito-deb
 	mv /tmp/iaito-deb root
 
 include ../deb_hand.mak

dist/macos/Makefile

@@ -1,8 +1,87 @@
-all:
-	$(SHELL) make-macos-app.sh
+.PHONY: all app dmg zip unpack-comps clean mrproper
 
-pkg:
-	$(SHELL) make-macos-pkg.sh
+all: clean app dmg
+app: disk/iaito.app
+dmg: iaito.dmg
+zip: iaito.zip
+unpack-comps: radare2-unpkg extra/r2ai extra/r2ghidra extra/r2ghidra_sleigh
+
+disk/iaito.app: ../../build/iaito.app unpack-comps
+	mkdir disk
+# Copy base bundle app
+	cp -a ../../build/iaito.app disk/
+# Copy r2 binary plugins
+	mkdir -p disk/iaito.app/Contents/PlugIns/radare2
+	install -p -m 0755 \
+		extra/r2ghidra/core_ghidra.dylib \
+		disk/iaito.app/Contents/PlugIns/radare2/
+# Copy r2 pkg files and update linking path for all binary files
+	scripts/embed-radare2.sh radare2-unpkg disk/iaito.app
+# Copy r2 non-binary plugins
+	install -p -m 0644 \
+		extra/r2ai/decai/decai.r2.js \
+		disk/iaito.app/Contents/Resources/radare2/lib/radare2/last/
+	cp -a extra/r2ghidra_sleigh \
+		disk/iaito.app/Contents/Resources/radare2/share/
+# Copy QT frameworks
+	macdeployqt disk/iaito.app -verbose=2
+
+iaito.dmg: disk/iaito.app
+	cp doc/README.txt disk/READ_THIS_FIRST.txt
+	ln -fs /Applications disk/
+	hdiutil create -format UDZO -fs APFS -volname iaito -srcfolder disk iaito
+
+iaito.zip:
+	cp doc/README.txt disk/READ_THIS_FIRST.txt
+	ditto -c -k --rsrc --extattr --sequesterRsrc disk iaito.zip
+
+radare2-unpkg: radare2.pkg
+	pkgutil --expand-full $< $@
+	touch $@
+
+radare2.pkg:
+	echo "Download first radare2.pkg from https://github.com/radareorg/radare2/releases"
+	@false
+
+r2ai.tar.gz:
+	echo "Download first r2ai.tar.gz (source) from https://github.com/radareorg/r2ai/releases"
+	@false
+
+extra/r2ai: r2ai.tar.gz
+	mkdir -p extra
+	rm -rf extra/r2ai extra/r2ai-* extra/radareorg-r2ai-*
+	tar -f $< -xzC extra/
+	cd extra && mv *r2ai-* r2ai
+	touch $@
+
+r2ghidra.zip:
+	echo "Download first r2ghidra.zip (binary) from https://github.com/radareorg/r2ghidra/releases"
+	@false
+
+extra/r2ghidra: r2ghidra.zip
+	mkdir -p extra
+	rm -rf extra/r2ghidra extra/r2ghidra-*-macos-*
+	unzip $< -d extra/
+	cd extra && mv r2ghidra-*-macos-* r2ghidra
+	touch $@
+
+r2ghidra_sleigh.zip:
+	echo "Download first r2ghidra_sleigh.zip from https://github.com/radareorg/r2ghidra/releases"
+	@false
+
+extra/r2ghidra_sleigh: r2ghidra_sleigh.zip
+	mkdir -p extra
+	rm -rf extra/r2ghidra_sleigh*
+	unzip $< -d extra/
+	cd extra && mv r2ghidra_sleigh-* r2ghidra_sleigh
+	touch $@
+
+../../build/iaito.app:
+	echo "Building iaito..."
+	$(MAKE) -C ../.. QMAKE_FLAGS=IAITO_BUNDLE_R2_APPBUNDLE=true
 
 clean:
-	rm -rf macos-pkg tmp
+	rm -rf radare2-unpkg disk iaito.dmg
+
+mrproper: clean
+	rm -rf radare2.pkg r2ai.tar.gz r2ghidra*.zip extra

dist/macos/Metadata/Distribution

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<installer-gui-script minSpecVersion="2">
-    <title>Iaito</title>
-    <license file="COPYING.LESSER" mime-type="text/plain"/>
-    <pkg-ref id="org.radare.iaito">
-        <bundle-version/>
-    </pkg-ref>
-    <options customize="never" require-scripts="false" hostArchitectures="x86_64,arm64"/>
-    <volume-check>
-        <allowed-os-versions>
-            <os-version min="10.7"/>
-        </allowed-os-versions>
-    </volume-check>
-    <choices-outline>
-        <line choice="default">
-            <line choice="org.radare.iaito"/>
-        </line>
-    </choices-outline>
-    <choice id="default" customLocation="usr"/>
-    <choice id="org.radare.iaito" visible="false">
-        <pkg-ref id="org.radare.iaito"/>
-    </choice>
-    <pkg-ref id="org.radare.iaito" version="0" onConclusion="none" installKBytes="51182">#iaito.pkg</pkg-ref>
-    <welcome file="welcome.rtf" mime-type="text/enriched"/>
-    <background file="iaitologo.png" mime-type="image/png" alignment="bottomleft"/>
-</installer-gui-script>

dist/macos/Metadata/Resources/COPYING

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

dist/macos/Metadata/Resources/COPYING.LESSER

@@ -1,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

dist/macos/Metadata/Resources/welcome.rtf

@@ -1,13 +0,0 @@
-{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf210
-{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
-{\colortbl;\red255\green255\blue255;}
-\margl1440\margr1440\vieww10800\viewh6300\viewkind0
-\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural
-
-\f0\fs28 \cf0 \
-\
-	You will be guided through the steps necessary to\
-	install this software. This pkg requires radare2 to\
-	be installed in your system. \
-\
-	This will install Iaito in /usr/local}

dist/macos/doc/README.txt

@@ -0,0 +1,7 @@
+IMPORTANT!
+
+To install iaito you can drag and drop the application to /Applications.
+But then you are required to run this commands from Terminal before you can execute for the first time.
+
+sudo xattr -c /Applications/iaito.app
+sudo codesign --force --deep --sign - /Applications/iaito.app

dist/macos/iaito.entitlements

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>com.apple.security.cs.debugger</key>
+    <true/>
+    <key>com.apple.security.cs.disable-library-validation</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+</dict>
+</plist>

dist/macos/make-macos-app.sh

@@ -1,51 +0,0 @@
-#!/bin/sh
-
-SKIPBUILD=0
-
-SRC=/tmp/iaito-macos
-PREFIX=/usr/local
-DST="$(pwd)/tmp/iaito.unpkg"
-if [ -n "$1" ]; then
-	VERSION="$1"
-else
-	VERSION="`../../configure -qV`"
-	[ -z "${VERSION}" ] && VERSION=5.3.l
-fi
-
-[ -z "${MAKE}" ] && MAKE=make
-
-while : ; do
-	[ -x "$PWD/configure" ] && break
-	[ "$PWD" = / ] && break
-	cd ..
-done
-
-[ ! -x "$PWD/configure" ] && exit 1
-
-pwd
-if [ ! -d build/iaito.app ]; then
-	rm -rf "${SRC}"
-	${MAKE} mrproper 2>/dev/null
-	# ${MAKE} -j4 || exit 1
-fi
-export CFLAGS=-O2
-if [ "$SKIPBUILD" = 0 ]; then
-	./configure --prefix="${PREFIX}" || exit 1
-	make -C .. translations
-fi
-${MAKE} install PREFIX="${PREFIX}" DESTDIR=${SRC} || exit 1
-mkdir -p "${DST}"
-echo "DST=$DST"
-if [ -d "${SRC}" ]; then
-	(
-		cd ${SRC} && find .
-		mv usr/local/share/iaito/translations Applications/iaito.app/Contents/Resources || exit 1
-		cd Applications || exit 1
-		rm -f /tmp/iaito-${VERSION}.zip
-		zip -r /tmp/iaito-${VERSION}.zip iaito.app
-	)
-	mv /tmp/iaito-${VERSION}.zip dist/macos
-else
-	echo "Failed install. DESTDIR is empty"
-	exit 1
-fi

dist/macos/make-macos-pkg.sh

@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# based on
-# http://blog.coolaj86.com/articles/how-to-unpackage-and-repackage-pkg-macos.html
-
-# to uninstall:
-# sudo pkgutil --forget org.radare.iaito
-SKIPBUILD=0
-
-SRC=/tmp/iaito-macos
-PREFIX=/usr/local
-DST="$(pwd)/tmp/iaito.unpkg"
-if [ -n "$1" ]; then
-	VERSION="$1"
-else
-	VERSION="`../../configure -qV`"
-	[ -z "${VERSION}" ] && VERSION=5.3.l
-fi
-
-[ -z "${MAKE}" ] && MAKE=make
-
-while : ; do
-	[ -x "$PWD/configure" ] && break
-	[ "$PWD" = / ] && break
-	cd ..
-done
-
-[ ! -x "$PWD/configure" ] && exit 1
-
-pwd
-if [ ! -d build/iaito.app ]; then
-	rm -rf "${SRC}"
-	${MAKE} mrproper 2>/dev/null
-	# ${MAKE} -j4 || exit 1
-fi
-export CFLAGS=-O2
-if [ "$SKIPBUILD" = 0 ]; then
-	./configure --prefix="${PREFIX}" || exit 1
-	make -C .. translations
-fi
-${MAKE} install PREFIX="${PREFIX}" DESTDIR=${SRC} || exit 1
-mkdir -p "${DST}"
-echo "DST=$DST"
-if [ -d "${SRC}" ]; then
-	(
-		cd ${SRC} && \
-		find . | cpio -o --format odc | gzip -c > "${DST}/Payload"
-	)
-	echo mkbom "${SRC}" "${DST}/Bom"
-	mkbom "${SRC}" "${DST}/Bom"
-	cp -rf dist/macos/Metadata/* "${DST}"
-	pwd
-	# Repackage
-	pkgutil --flatten "${DST}" "${DST}/../../iaito-${VERSION}.pkg"
-else
-	echo "Failed install. DESTDIR is empty"
-	exit 1
-fi

dist/macos/scripts/command.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+CMD=$(basename "$0")
+APPDIR=$(cd "$(dirname "$0")/../../../.."; pwd)
+
+R2_BINDIR="${APPDIR}/Contents/Helpers"
+R2_LIBDIR="${APPDIR}/Contents/Frameworks"
+R2_PREFIX="${APPDIR}/Contents/Resources/radare2"
+
+XDG_CACHE_HOME="${HOME}/Library/Caches/radareorg/iaito"
+XDG_CONFIG_HOME="${HOME}/Library/Preferences/radareorg/iaito"
+XDG_DATA_HOME="${HOME}/Library/Application Support/radareorg/iaito"
+
+export R2_BINDIR
+export R2_LIBDIR
+export R2_PREFIX
+export XDG_CACHE_HOME
+export XDG_CONFIG_HOME
+export XDG_DATA_HOME
+
+exec "${R2_BINDIR}/${CMD}" "$@"

dist/macos/scripts/embed-radare2.sh

@@ -0,0 +1,75 @@
+#!/bin/sh -e
+
+R2PKGDIR="$1"
+APPDIR="$2"
+
+SCRIPTS="$(dirname "$0")"
+R2DIR="${R2PKGDIR}/Payload/usr/local"
+R2V=$(readlink "${R2DIR}/lib/radare2/last")
+
+fix_binary() {
+  FILE=$1
+  PREFIX=$2
+  shift 2
+  echo "Change library paths for \"$FILE\"..."
+  ARGS=$(otool -L "$FILE" | awk 'BEGIN{ORS=" "}/\/usr\/local\/lib\/libr_/{dst=$1; sub(/\/usr\/local\/lib/,"'"$PREFIX"'", dst); print "-change "$1" "dst}')
+  if [ -n "$ARGS" -o -n "$1" ]; then
+    echo " install_name_tool $@ $ARGS \"$FILE\""
+    install_name_tool $@ $ARGS "$FILE"
+  fi
+}
+
+mkdir -p \
+  "${APPDIR}/Contents/Helpers" \
+  "${APPDIR}/Contents/Frameworks" \
+  "${APPDIR}/Contents/PlugIns/radare2" \
+  "${APPDIR}/Contents/Resources/radare2/bin" \
+  "${APPDIR}/Contents/Resources/radare2/lib/radare2/${R2V}/"
+
+cp -a "${R2DIR}/bin/"*                      "${APPDIR}/Contents/Helpers/"
+cp -a "${R2DIR}/lib/radare2/${R2V}/"*.dylib "${APPDIR}/Contents/PlugIns/radare2/"
+cp -a "${R2DIR}/lib/"*.dylib                "${APPDIR}/Contents/Frameworks/"
+cp -a "${R2DIR}/include"                    "${APPDIR}/Contents/Resources/radare2/"
+cp -a "${R2DIR}/share"                      "${APPDIR}/Contents/Resources/radare2/"
+#cp -a "${R2DIR}/lib/pkgconfig"              "${APPDIR}/Contents/Resources/radare2/lib/"
+cp -p "${SCRIPTS}/command.sh"               "${APPDIR}/Contents/Resources/radare2/bin/radare2"
+cp -a "${R2DIR}/lib/radare2/last"           "${APPDIR}/Contents/Resources/radare2/lib/radare2/"
+#cp -a "${R2DIR}/lib/radare2/${R2V}/"*.js    "${APPDIR}/Contents/Resources/radare2/lib/radare2/${R2V}/"
+
+# Move all non-binary files outside Helpers folder
+mv "${APPDIR}/Contents/Helpers/clang-format-radare2" "${APPDIR}/Contents/Resources/radare2/bin/"
+
+(
+  cd "${APPDIR}/Contents/MacOS"
+  fix_binary "iaito" "@rpath"
+)
+
+(
+  cd "${APPDIR}/Contents/Helpers"
+  for c in *; do
+    [ -L "$c" ] || fix_binary "$c" "@rpath" -add_rpath "@executable_path/../Frameworks"
+    [ "$c" != "radare2" ] && ln -s radare2 "../Resources/radare2/bin/$c"
+  done
+)
+
+(
+  LIBS=$(cd "${R2DIR}/lib"; ls *.dylib)
+  cd "${APPDIR}/Contents/Frameworks"
+  for c in $LIBS; do
+    [ -L "$c" ] || fix_binary "$c" "@loader_path" -id "@rpath/$c"
+    c2=$c # Resolve upto 2 link levels
+    [ -L "$c2" ] && c2=$(readlink "$c2")
+    [ -L "$c2" ] && c2=$(readlink "$c2")
+    ln -s "../../../Frameworks/$c2" "../Resources/radare2/lib/$c"
+  done
+)
+
+(
+  cd "${APPDIR}/Contents/PlugIns/radare2"
+  for c in *.dylib; do
+    [ -L "$c" ] || fix_binary "$c" "@rpath" -add_rpath "@loader_path/../../Frameworks" -id "$c"
+    ln -s "../../../../../PlugIns/radare2/$c" "../../Resources/radare2/lib/radare2/${R2V}/$c"
+  done
+  # Required for plugins rpath when loaded from Resources
+  ln -s "../../../Frameworks"                 "../../Resources/radare2/lib/Frameworks"
+)

doc/data-analysis.md

@@ -0,0 +1,50 @@
+# Data Analysis
+
+Open **View → Data → Analysis**. The dock is hidden in the default layout and when
+first added to an older saved layout. Hidden docks do not sample data. **Zoom** is
+also available under **View → Data**.
+
+- **Algorithms** enables multiple byte metrics. Hover over a named legend entry
+  for its definition; click it to edit its color or visibility. Clicking the legend
+  does not remove the series.
+- **Options → Resolution (buckets)** selects 32, 64, 128, 256, 512, 1024, 2048 or
+  4096 buckets. Lower values give coarser graphs and less work. The default is 1024.
+- **Options** also controls lines, filled lines or vertical bars, separate tracks,
+  greyscale/rainbow/theme colors, custom colors, and structural markers.
+- Click the graph to seek. Drag to select bytes. Wheel or `+`/`-` zooms;
+  Shift+wheel or the arrow keys pans. `Home` fits all data, and `Esc` clears selection.
+- The bottom entropy overview shows the complete address span. Drag its window
+  to pan, drag its edges to resize the range, or double-click to fit all data.
+- **Range** fits the current section, segment, map, block or selection.
+  **Edit range** accepts radare2 expressions and inclusive endpoints.
+- **Follow** keeps the current seek address visible. Offset synchronization and
+  the global address-selection synchronization setting control integration with
+  disassembly and hexdump widgets.
+- **Find marker** searches sections, segments, maps, flags (including search hits)
+  and comments. The graph context menu provides comments, flags and “Show in”.
+  Hover details appear after the pointer rests for 650 ms.
+- Hexdump selections, sections and segments have direct analysis actions.
+  Other addressable widgets can use **Show in → Data Analysis**.
+
+The graph uses the current radare2 address space: virtual addresses with `io.va`
+enabled, otherwise physical offsets in the active descriptor. Gaps and failed reads
+do not contribute invented bytes. Each bucket reads at most 4096 bytes from centered
+windows in readable spans. Tooltips, the status line and exported CSV report how
+many bytes were actually read. Zoom in for complete coverage of a region. Entropy
+is measured per bucket, so very small buckets have a lower attainable entropy.
+
+Multiple overlaid series use a normalized percentage scale. Entropy's native scale
+is 0–8 bits/byte, unique bytes 0–256, and mean byte 0–255. A single series or separate
+tracks uses its native scale. CSV exports normalized values plus exact bucket bounds
+and coverage. Display settings are saved with the layout.
+
+Other widgets can call `MainWindow::showDataAnalysis(start, end)` or
+`DataAnalysisWidget::showRange(start, end)` with **inclusive** endpoints. Internally,
+`DataAnalysis::Range` and graph signals use half-open ranges.
+
+Run the focused tests with:
+
+```sh
+make -C tests/dataanalysis -j8 > /dev/null
+QT_QPA_PLATFORM=offscreen tests/dataanalysis/build/test_dataanalysis
+```

doc/deeplinks.md

@@ -0,0 +1,264 @@
+Iaito Deep Links
+================
+
+Iaito registers the `iaito://` URI scheme so binaries, projects, samples and raw
+bytes can be referenced with stable, shareable links that open a specific
+location and view. Clicking such a link (from a browser, file manager, chat
+client, terminal, etc.) launches Iaito and navigates straight to the target.
+
+The implementation lives in a single, self-contained pair of files,
+`src/common/DeepLink.{h,cpp}`, so it is easy to find, maintain and remove.
+
+
+URI format
+----------
+
+```
+iaito://<handler>/<payload>?<query>
+```
+
+There are exactly four top-level handlers:
+
+| Handler        | Payload          | Opens                                    |
+|----------------|------------------|------------------------------------------|
+| `file`         | absolute path    | a file from disk                         |
+| `project`      | project name     | a saved radare2/iaito project            |
+| `sha256`       | 64 hex chars     | a locally registered sample by its hash  |
+| `bytes`        | hex byte string  | an in-memory buffer built from raw bytes |
+
+Only **absolute paths** are accepted for `file`.
+
+As a convenience, if the host part of the URI is empty the absolute path is
+treated as a `file` reference:
+
+```
+iaito:///bin/ls        is the same as        iaito://file/bin/ls
+```
+
+Examples:
+
+```
+iaito://file/tmp/a.out
+iaito://project/r2
+iaito://sha256/0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef
+iaito://bytes/554889e54883ec10
+```
+
+
+Query parameters
+----------------
+
+Parameters are passed as standard URL query parameters (`?a=1&b=2`), not as
+`#fragments`. Unknown parameters are ignored, so the format can be extended in
+the future without breaking existing links.
+
+### Navigation
+
+| Param   | Meaning                                                                |
+|---------|------------------------------------------------------------------------|
+| `addr`  | Any expression radare2 can resolve via `s <expr>`                      |
+| `view`  | The panel to raise after opening                                       |
+| `size`  | Region length / block size (integer, decimal or `0x` hex)              |
+
+`addr` accepts anything radare2 understands:
+
+```
+addr=0x401000
+addr=sym.main
+addr=entry0
+addr=str.Hello
+```
+
+`view` may be one of:
+
+```
+disasm      graph       hex         decompiler
+strings     imports     exports     functions
+```
+
+`disasm`, `graph`, `hex` and `decompiler` open/raise the corresponding memory
+widget; the other names raise the matching tool panel by name.
+
+`size` sets the current block size (radare2 `b`), e.g. `size=64` or `size=0x100`.
+
+### Analysis (mostly for `bytes` and raw/unknown binaries)
+
+| Param    | Examples                                            |
+|----------|-----------------------------------------------------|
+| `arch`   | `x86`, `arm`, `arm64`, `mips`, `riscv`, `ppc`       |
+| `bits`   | `16`, `32`, `64`                                    |
+| `endian` | `little`, `big`                                     |
+| `cpu`    | `generic`, `cortex`, `avr`, `68000`, `v850`         |
+| `os`     | `linux`, `darwin`, `windows`, `ios`, `android`      |
+| `base`   | base/map address, e.g. `0`, `0x1000`, `0x401000`    |
+
+For `bytes` links Iaito builds an in-memory `malloc://` buffer, writes the
+provided bytes into it and configures the session accordingly:
+
+| Query param | radare2 config |
+|-------------|----------------|
+| `arch`      | `asm.arch`     |
+| `bits`      | `asm.bits`     |
+| `endian`    | `cfg.bigendian`|
+| `cpu`       | `asm.cpu`      |
+| `os`        | `asm.os`       |
+| `base`      | `bin.baddr`    |
+
+
+Examples
+--------
+
+Open a file and jump to an address:
+
+```
+iaito://file/tmp/a.out?addr=0x401000
+```
+
+Open a project and show the graph view at `main`:
+
+```
+iaito://project/r2?addr=sym.main&view=graph
+```
+
+Open a sample by SHA256 and show the decompiler:
+
+```
+iaito://sha256/<hash>?addr=sym.main&view=decompiler
+```
+
+Open a sample by SHA256 and select a region in the hex view:
+
+```
+iaito://sha256/<hash>?addr=0x401000&size=0x100&view=hex
+```
+
+Disassemble raw x86-64 shellcode:
+
+```
+iaito://bytes/554889e54883ec10?arch=x86&bits=64&view=disasm
+```
+
+Disassemble little-endian ARM code:
+
+```
+iaito://bytes/e92d4800e8bd8800?arch=arm&bits=32&endian=little
+```
+
+Analyze a raw big-endian MIPS firmware blob mapped at a base address:
+
+```
+iaito://bytes/<hex>?arch=mips&bits=32&endian=big&base=0x80000000
+```
+
+Open bytes and jump to an offset in the hex view:
+
+```
+iaito://bytes/<hex>?arch=x86&bits=64&addr=0x10&view=hex
+```
+
+
+SHA256 samples database
+------------------------
+
+`sha256` links resolve a hash to a local file through Iaito's samples database,
+which maps the SHA256 of every binary it has seen to its path on disk. Files are
+registered automatically when opened and can be managed from the *Sha256* tab in
+the New File dialog. If the hash is unknown, Iaito shows a dialog explaining how
+to register it; downloading unknown samples is out of scope.
+
+See [sha256.md](sha256.md) for the on-disk layout, hashing, how to populate the
+database, and the configurable online lookup URL.
+
+
+Registering the URI handler
+---------------------------
+
+The `iaito://` scheme must be associated with the Iaito executable at the OS
+level. This happens automatically with the standard install targets, and can
+also be run on its own.
+
+### Make targets
+
+```
+make install-deeplink      # register iaito:// for the current user
+make uninstall-deeplink     # remove the association
+```
+
+`make user-install` registers the handler as part of installation, and
+`make uninstall` / `make user-uninstall` removes it. A system-wide
+`make install` refreshes the desktop database so the `.desktop` MimeType
+association is picked up.
+
+### Linux
+
+Registration relies on the desktop entry `src/org.radare.iaito.desktop`, which
+declares:
+
+```
+Exec=iaito %u
+MimeType=x-scheme-handler/iaito;
+```
+
+`scripts/deeplink/register.sh` runs `xdg-mime default` and
+`update-desktop-database`; `scripts/deeplink/unregister.sh` removes the
+association from `~/.config/mimeapps.list`.
+
+### macOS
+
+The app bundle declares the scheme in `Info.plist` via `CFBundleURLTypes`
+(`CFBundleURLSchemes = iaito`). LaunchServices registers it automatically when
+the bundle is installed; `scripts/deeplink/register.sh` forces a refresh with
+`lsregister -f <iaito.app>`. The handler is dropped when the bundle is removed.
+
+`make run` launches the build without registering the URI handler. To optionally
+register the local bundle without installing it, run:
+
+```sh
+sh scripts/deeplink/register.sh "$PWD/build/iaito.app"
+```
+
+### Windows
+
+`scripts/deeplink/register.bat` writes the `HKCU\Software\Classes\iaito` keys
+(including `URL Protocol` and `shell\open\command`) and
+`scripts/deeplink/unregister.bat` deletes them. Pass the path to `iaito.exe` as
+the first argument:
+
+```
+scripts\deeplink\register.bat "C:\Program Files\iaito\iaito.exe"
+scripts\deeplink\unregister.bat
+```
+
+
+Using deep links from the UI
+----------------------------
+
+Every code view and listing exposes a **Copy deep link** action that builds a
+link to the current address:
+
+- Disassembly, decompiler and graph context menus (under *Copy* -> *Deep link*),
+  embedding the matching `view=` value (`disasm`, `decompiler`, `graph`).
+- Hexdump context menu (*Copy* -> *Deep link*, `view=hex`).
+- The listing widgets (functions, symbols, imports, exports, strings, relocs,
+  sections, ...) via the *Copy deep link* entry in their context menu.
+
+When triggered, a dialog asks how the open file should be referenced: by loaded
+project name, by `sha256`, or by absolute `file` path. The resulting URI is
+placed on the clipboard, ready to paste into a report or a comment.
+
+Links pasted into comments are rendered as clickable text in the disassembly and
+decompiler views: hovering shows a pointing-hand cursor and a left click follows
+the link. A link that points back into the file already open navigates in place
+(seek + view switch) instead of reopening the binary.
+
+Notes
+-----
+
+- `addr` is resolved through radare2's `s` command, so it accepts the full range
+  of radare2 address expressions (flags, symbols, math, etc.).
+- `size` is always resolved to a number before use, so it cannot inject
+  additional radare2 commands.
+- Query parameters are preferred over `#fragments`; future parameters can be
+  added without changing the URI format.
+- The four handlers (`file`, `project`, `sha256`, `bytes`) are intentionally the
+  only top-level entry points.

doc/sha256.md

@@ -0,0 +1,94 @@
+Iaito SHA256 Samples Database
+=============================
+
+Iaito keeps a local database that maps the SHA256 of every binary it has seen to
+its path on disk. It powers `iaito://sha256/<hash>` deep links (see
+[deeplinks.md](deeplinks.md)) and the *Sha256* tab in the New File dialog, and it
+lets you look a sample up online (VirusTotal by default).
+
+The implementation lives in `src/common/SamplesDB.{h,cpp}`.
+
+
+On-disk layout
+--------------
+
+The database lives under Iaito's application data directory
+(`QStandardPaths::AppDataLocation`, e.g. `~/.local/share/radareorg/iaito/samples/`
+on Linux).
+
+To scale to large collections without a single huge index file, entries are
+sharded git/rainbow-table style across two hash-prefix directory levels. The
+leaf is a plain text bucket file holding one `"<sha256> <absolute-path>"` entry
+per line:
+
+```
+samples/<h0:2>/<h2:4>/<h0:4>
+
+samples/53/a9/53a9   ->   53a9c0557a948069...172161625 /samples/a.out
+                          53a9ffeede...                 /samples/b.bin
+```
+
+- The two directory levels are the first two and next two hex characters of the
+  hash, giving up to 65536 buckets so no single directory grows unbounded.
+- The leaf bucket file is named after the 4-character prefix and contains all
+  entries sharing it, hash and absolute path separated by a single space.
+- Lookups read just one bucket file; the whole database is only walked when the
+  *Sha256* tab lists every entry.
+
+When the same hash is registered again with a different path, the latest path
+wins (one path per hash).
+
+
+Hashing
+-------
+
+`SamplesDB::sha256File()` computes the digest with radare2's `r_muta` SHA256
+session API, reading the file in fixed-size blocks. Memory stays bounded
+regardless of file size, so even multi-gigabyte files hash safely without being
+loaded into memory at once.
+
+
+Populating the database
+-----------------------
+
+- **Automatically** — every file you open in Iaito is registered (sha256 -> path)
+  once it finishes loading, from `MainWindow::finalizeOpen()`. Hashing runs on a
+  background thread so the UI stays responsive on large files. Live debug
+  sessions and non-file targets (`malloc://`, `dbg://`, ...) are skipped, as are
+  paths that no longer exist.
+- **Manually** — the *Sha256* tab in the New File dialog lets you:
+  - **Scan folder…** — recursively register every file under a chosen directory
+    (runs in the background).
+  - **Filter** — the input field filters the list by file name or hash as you
+    type.
+  - **On disk** — a column shows whether each registered file still exists.
+  - **Open** — open the selected sample (also on double-click).
+  - **Lookup** — open the configured lookup URL for the selected hash.
+  - **Delete** — remove the selected entry from the database (the file is left
+    untouched).
+  - **Right-click** — *Copy path*, *Copy hash*, *Open containing folder*,
+    *Open in lookup URL*, *Remove from database*.
+
+
+Online lookup URL
+-----------------
+
+The *Lookup* button and the *Open in lookup URL* context action open a base URL
+with the selected file's SHA256 appended. The base URL defaults to VirusTotal:
+
+```
+https://www.virustotal.com/gui/file/<sha256>
+```
+
+It is configurable in *Settings -> Samples* (stored as `sha256.lookupBaseUrl`),
+where a *Reset* button restores the VirusTotal default. This lets you point the
+lookup at any service that resolves a file by its SHA256.
+
+
+Deep link resolution
+---------------------
+
+`iaito://sha256/<hash>` looks the hash up in the database and opens the mapped
+file if it still exists, applying any `addr`/`view`/`size` parameters. If the
+hash is unknown, Iaito shows a dialog explaining how to register it. Downloading
+unknown samples is intentionally out of scope.

doc/structures.md

@@ -0,0 +1,30 @@
+# Structures in the hexdump
+
+Open the hexdump sidebar's **Structures** tab, choose an r2 type, enter an address
+or expression, and press **Inspect**. **At cursor** uses the first selected byte
+or the current cursor. You can also right-click the hexdump and choose **Inspect
+structure here**; a type already linked to that address is selected automatically.
+
+The tree shows each field's declared type, value, address, and size. Expand nested
+structures, unions, arrays, and pointers to explore them. Selecting a field selects
+its bytes in the hexdump. Field colors match the byte highlights. The inspected
+structure stays anchored while you navigate, and **Refresh** preserves expanded
+fields and the selected row while rereading memory and type definitions.
+
+Types come from r2's type database, including imported C definitions and typedefs.
+The tree uses stored member offsets and the current `asm.bits` and `cfg.bigendian`
+settings. Large arrays are divided into expandable groups. Unmapped pointers and
+recursive references stop expansion; invalid or overflowing layouts are reported.
+Array expressions such as `uint16_t[16]` can be inspected directly.
+
+**Pin type** creates an r2 type link (`tl`) at the inspected address. The pinned
+address list also includes existing type links and command annotations (`Cr`) from
+the current r2 session. Define a named typedef before pinning an array expression.
+
+**Pin command…** stores a command at the address using the selected byte range or
+the chosen type's size. Double-click a pin to navigate to its address. Select a
+command pin and press **Run command** to display its output. **Unpin** removes only
+the selected type link or command annotation. Pins use r2's existing project data
+and are saved with the project. iaito also writes `iaito-memory-pins.json` inside the
+project directory to preserve types and pins omitted by some r2 binary project versions;
+keep that companion file when copying a project.

docker/Dockerfile

@@ -8,7 +8,8 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apk add --no-cache \
     bash \
     build-base \
-    cmake \
+    meson \
+    ninja \
     curl \
     git \
     linux-headers \
@@ -23,7 +24,7 @@ RUN apk add --no-cache \
     unzip \
     zip \
     wget && \
-    git clone --recurse-submodules https://github.com/radareorg/iaito.git /opt/iaito && \
+    git clone https://github.com/radareorg/iaito.git /opt/iaito && \
     git clone --recurse-submodules https://github.com/radareorg/radare2 /opt/radare2 && \
     cd /opt/radare2 && ./sys/install.sh /usr && \
     cd /opt/iaito && sh configure && make
@@ -58,4 +59,4 @@ RUN apk add --no-cache \
 WORKDIR /home/r2
 ADD entrypoint.sh /usr/local/bin/entrypoint.sh
 
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

make.bat

@@ -1,20 +1,30 @@
-SET "R2DIST=r2_dist"
+SET "R2DIR=radare2"
 SET "BUILDDIR=build_%PLATFORM%"
 
 ECHO Preparing directory
-RMDIR /S /Q %BUILDDIR%
-MKDIR %BUILDDIR%
-nmake
-IF !ERRORLEVEL! NEQ 0 EXIT /B 1
+CD src
+meson --buildtype=release %* ..\%BUILDDIR%
+CD ..\%BUILDDIR%
+ninja -j4
+if %ERRORLEVEL% NEQ 0 (
+	EXIT /B 1
+)
+CD ..
 
 ECHO Deploying iaito
-MKDIR iaito
-COPY release\iaito.exe iaito\iaito.exe
-XCOPY /S /I ..\%R2DIST%\share iaito\share
-XCOPY /S /I ..\%R2DIST%\lib iaito\lib
-DEL iaito\lib\*.lib
-COPY ..\%R2DIST%\bin\*.dll iaito\
-windeployqt iaito\iaito.exe
-FOR %%i in (..\src\translations\*.qm) DO MOVE "%%~fi" iaito\translations
+IF NOT EXIST release (
+	MKDIR release
+)
+COPY %BUILDDIR%\iaito.exe release\iaito.exe
+XCOPY /S /I %R2DIR%\share release\share
+XCOPY /S /I %R2DIR%\lib release\lib
+DEL release\lib\*.lib
+COPY %R2DIR%\bin\*.dll release\
+windeployqt release\iaito.exe
+FOR %%i in (..\src\translations\*.qm) DO MOVE "%%~fi" release\translations
+
+IF DEFINED CI (
+	RENAME release iaito
+)
 
 ENDLOCAL

meson.py

@@ -1,102 +0,0 @@
-import argparse
-import importlib.util
-import logging
-import os
-import subprocess
-import sys
-
-ROOT = None
-log = None
-r2_meson_mod = None
-
-def import_r2_meson_mod():
-    """Import radare2/sys/meson.py"""
-    global r2_meson_mod
-    folder = os.path.dirname(__file__)
-    r2_meson_path = os.path.join(folder, 'radare2', 'sys', 'meson.py')
-    r2_meson_spec = importlib.util.spec_from_file_location('meson', r2_meson_path)
-    r2_meson_mod = importlib.util.module_from_spec(r2_meson_spec)
-    r2_meson_spec.loader.exec_module(r2_meson_mod)
-
-def set_global_vars():
-    global log
-    global ROOT
-
-    ROOT = os.path.abspath(os.path.dirname(__file__))
-
-    logging.basicConfig(format='[%(name)s][%(levelname)s]: %(message)s',
-                        level=logging.DEBUG)
-    log = logging.getLogger('cutter-meson')
-    log.debug('ROOT: %s', ROOT)
-
-    r2_meson_mod.set_global_variables()
-
-def win_dist(args):
-    os.makedirs(args.dist)
-    r2_meson_mod.copy(os.path.join(args.dir, 'iaito.exe'), args.dist)
-    log.debug('Deploying Qt5')
-    subprocess.call(['windeployqt', '--release', os.path.join(args.dist, 'iaito.exe')])
-    log.debug('Deploying libr2')
-    r2_meson_mod.PATH_FMT.update(r2_meson_mod.R2_PATH)
-    r2_meson_mod.meson('install', options=[['-C', '{}'.format(args.dir)], '--no-rebuild'])
-
-def build(args):
-    cutter_builddir = os.path.join(ROOT, args.dir)
-    if not os.path.exists(cutter_builddir):
-        defines = ['-Denable_python=%s' % str(args.python).lower(),
-                   '-Denable_python_bindings=%s' % str(args.python_bindings).lower()]
-        if os.name == 'nt':
-            defines.append('-Dradare2:r2_incdir=radare2/include')
-            defines.append('-Dradare2:r2_libdir=radare2/lib')
-            defines.append('-Dradare2:r2_datdir=radare2/share')
-            defines.append('-Dc_args=-D_UNICODE -DUNICODE')
-        r2_meson_mod.meson('setup', rootdir=os.path.join(ROOT, 'src'), builddir=args.dir,
-                           prefix=os.path.abspath(args.dist), backend=args.backend,
-                           release=args.release, shared=False, options=defines)
-    if not args.nobuild:
-        log.info('Building cutter')
-        if args.backend == 'ninja':
-            r2_meson_mod.ninja(cutter_builddir)
-        else:
-            project = os.path.join(cutter_builddir, 'iaito.sln')
-            r2_meson_mod.msbuild(project, '/m')
-
-def main():
-    set_global_vars()
-
-    parser = argparse.ArgumentParser(description='Meson script for iaito')
-    parser.add_argument('--backend', choices=r2_meson_mod.BACKENDS,
-                        default='ninja', help='Choose build backend')
-    parser.add_argument('--dir', default='build',
-                        help='Destination build directory')
-    parser.add_argument('--python', action='store_true',
-                        help='Enable Python support')
-    parser.add_argument('--python-bindings', action='store_true',
-                        help='Enable Python Bindings')
-    parser.add_argument('--release', action='store_true',
-                        help='Set the build as Release (remove debug info)')
-    parser.add_argument('--nobuild', action='store_true',
-                        help='Only run meson and do not build.')
-    if os.name == 'nt':
-        parser.add_argument('--dist', help='dist directory')
-    args = parser.parse_args()
-
-    if os.name == 'nt' and not args.dist:
-        args.dist = args.dir
-    args.dist = os.path.abspath(args.dist)
-    args.dir = os.path.abspath(args.dir)
-
-    if hasattr(args, 'dist') and args.dist and os.path.exists(args.dist):
-        log.error('%s already exists', args.dist)
-        sys.exit(1)
-
-    log.debug('Arguments: %s', args)
-
-    build(args)
-
-    if os.name == 'nt' and hasattr(args, 'dist') and args.dist:
-        win_dist(args)
-
-import_r2_meson_mod()
-if __name__ == '__main__':
-    main()

preconfigure

@@ -1,2 +0,0 @@
-#!/bin/sh
-git submodule update --init

preconfigure.bat

@@ -1,6 +1,7 @@
 @ECHO OFF
 
-SET "R2V=5.7.0"
+IF NOT DEFINED R2V SET "R2V=5.8.8"
+SET ARCH=x64
 
 SETLOCAL ENABLEDELAYEDEXPANSION
 
@@ -13,22 +14,22 @@ IF !ERRORLEVEL! NEQ 0 (
 )
 
 SET "PATH=%CD%;%PATH%"
-SET "R2DIST=r2_dist"
+SET "R2DIR=radare2"
 
+IF NOT DEFINED CI (
 ECHO Downloading radare2 (%PLATFORM%)
-rem powershell -command "Invoke-WebRequest 'https://github.com/radareorg/radare2/releases/download/5.1.0/radare2-5.1.0_windows.zip' -OutFile 'radare2-5.1.0_windows.zip'"
-pip install wget
-python -m wget -o r2.zip https://github.com/radareorg/radare2/releases/download/%R2V%/radare2-%R2V%-w64.zip
+curl -L -o r2.zip https://github.com/radareorg/radare2/releases/download/%R2V%/radare2-%R2V%-w64.zip
 unzip r2.zip
-RMDIR /S /Q %R2DIST%
-MOVE radare2-%R2V%-w64 %R2DIST%
-SET "PATH=%CD%\%R2DIST%\bin;%PATH%"
+RENAME radare2-%R2V%-w64 %R2DIR%
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
+)
+SET "PATH=%CD%\%R2DIR%\bin;%PATH%"
 
 rem ECHO Building radare2 (%PLATFORM%)
 rem CD radare2
 rem git clean -xfd
-rem RMDIR /S /Q ..\%R2DIST%
-rem rem python sys\meson.py --release --shared --install --prefix=%CD%\..\%R2DIST% --options "r2_datdir=radare2/share" "r2_libdir=radare2/lib" #"c_args=-D_UNICODE -DUNICODE"
-rem meson.exe r2_builddir --buildtype=release --prefix=%CD%\..\%R2DIST% || EXIT /B 1
+rem RMDIR /S /Q ..\%R2DIR%
+rem meson -C src r2_builddir
+rem meson.exe r2_builddir --buildtype=release --prefix=%CD%\..\%R2DIR% || EXIT /B 1
 rem ninja -C r2_builddir install || EXIT /B 1
 rem IF !ERRORLEVEL! NEQ 0 EXIT /B 1

scripts/Brewfile

@@ -1,6 +0,0 @@
-brew "p7zip"
-brew "ccache"
-brew "openssl"
-brew "xz"
-brew "llvm"
-brew "meson"

scripts/appbundle_embed_python.sh

@@ -1,59 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-if ! [[ $# -eq 3 ]]; then
-    echo "Usage: $0 [Python.framework] [AppBundle.app] [AppBundle.app/Contents/MacOS/Executable]"
-    exit 1
-fi
-
-python_version=python3.6
-
-py_framework=$1
-appbundle=$2
-executable=$3
-
-echo "Embedding $py_framework into $appbundle | $executable"
-
-mkdir -p "$appbundle/Contents/Frameworks"
-if [ ! -d "$appbundle/Contents/Frameworks/Python.framework" ]
-then
-    cp -a -n "$py_framework" "$appbundle/Contents/Frameworks/"
-    echo "Cleaning up embedded Python Framework"
-    cd "$appbundle/Contents/Frameworks/Python.framework"
-    find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
-    rm -r Versions/Current/Resources/* "Versions/Current/lib/$python_version/test" "Versions/Current/lib/$python_version/idlelib" "Versions/Current/lib/$python_version/curses" "Versions/Current/lib/$python_version/lib2to3" || echo "Couldn't remove something"
-else
-    echo "Python.framework already exists, skipping copying"
-    cd "$appbundle/Contents/Frameworks/Python.framework"
-fi
-
-echo "Making executable $executable point to embedded Framework"
-install_name_tool -change `otool -L "$executable" | sed -n "s/^[[:blank:]]*\([^[:blank:]]*Python\) (.*$/\1/p"` @executable_path/../Frameworks/Python.framework/Versions/Current/Python "$executable" 
-
-<<<<<<< HEAD:scripts/appbundle_embed_python.sh
-echo "Cleaning up embedded Python Framework"
-cd "$appbundle/Contents/Frameworks/Python.framework" || exit 1
-find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf || exit 1
-rm -r Versions/Current/Resources/* Versions/Current/lib/python3.6/test Versions/Current/lib/python3.6/idlelib Versions/Current/lib/python3.6/curses Versions/Current/lib/python3.6/lib2to3 || exit 1
-
-=======
->>>>>>> 29cbd06a... Run macos packaging in GHA. (#2529):dist/appbundle_embed_python.sh
-echo "Checking if PySide2 is available"
-
-pyside_prefix=$(pkg-config --variable=prefix pyside2)
-if [ $? -ne 0 ]; then
-	echo "PySide2 is not available, ignoring."
-	exit 0
-fi
-
-echo "PySide is at $pyside_prefix"
-
-if [ ! -d "Versions/Current/lib/$python_version/site-packages/PySide2" ]
-then
-    cp -va "$pyside_prefix/lib/$python_version/" "Versions/Current/lib/$python_version"
-    cd .. # $appbundle/Contents/Frameworks
-    cp -va "$pyside_prefix/lib/"*.dylib .
-else
-    echo "site-packages/Pyside2 exists, skipping copying"
-fi
-

scripts/appbundle_patch_qtwebengine.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if ! [[ $# -eq 1 ]]; then
-    echo "Usage: $0 [AppBundle.app]"
-    exit 1
-fi
-
-appbundle=$1
-qtwebegineprocess="$1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess"
-
-echo "Patching $appbundle to fix QtWebEngine"
-
-if ! [[ -f "$qtwebegineprocess" ]]; then
-	echo "$qtwebegineprocess does not exist. Did you forget to run macdeployqt?"
-	exit 1
-fi
-
-install_name_tool `otool -L "$qtwebegineprocess" | sed -n "s/^[[:blank:]]*\(\/usr\/local\/Cellar[^[:blank:]]*\(Qt[A-Za-z]*\.framework[^[:blank:]]*\)\) (.*$/-change \1 @executable_path\/..\/..\/..\/..\/..\/..\/..\/\2/p"` \
-    $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess \
-    || exit 1
-
-mkdir -p $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks
-ln -s ../../../../../../../QtCore.framework        $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtQuick.framework       $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtGui.framework         $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtQml.framework         $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtNetwork.framework     $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtWebChannel.framework  $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/
-ln -s ../../../../../../../QtPositioning.framework $1/Contents/Frameworks/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/Frameworks/ 
-      
-      
-      
-      

scripts/appimage_embed_python.sh

@@ -1,37 +0,0 @@
-#!/bin/bash
-
-if ! [[ $# -eq 1 ]]; then
-    echo "Usage: $0 [appdir]"
-    exit 1
-fi
-
-python_version=python3.6
-
-python_prefix=$(pkg-config --variable=prefix python3)
-appdir=$1
-
-echo "Embedding Python from prefix $python_prefix in appdir $appdir"
-
-mkdir -p "$appdir/usr"
-cd "$appdir/usr/" || exit 1
-
-cp -RT "$python_prefix" "." || exit 1
-echo "Cleaning up embedded Python"
-find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf
-rm -r lib/$python_version/test lib/$python_version/idlelib lib/$python_version/curses lib/$python_version/lib2to3
-
-echo "Checking if PySide2 is available"
-
-pyside_prefix=$(pkg-config --variable=prefix pyside2)
-if [ $? -ne 0 ]; then
-	echo "PySide2 is not available, ignoring."
-	exit 0
-fi
-
-echo "PySide is at $pyside_prefix"
-
-if [ "$pyside_prefix" == "$python_prefix" ]; then
-	echo "Prefixes are equal, not copying anything from lib"
-else
-	cp -RT "$pyside_prefix/lib/$python_version" "lib/$python_version" || exit 1
-fi

scripts/appveyor_r2ghidra.sh

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-scripts/r2ghidra.sh \
-	-DCMAKE_C_COMPILER=cl \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_PREFIX_PATH="$APPVEYOR_BUILD_FOLDER/r2_dist;$APPVEYOR_BUILD_FOLDER/r2_dist/include/libr;$APPVEYOR_BUILD_FOLDER/r2_dist/include/libr/sdb" \
-	-DCMAKE_INSTALL_PREFIX="$APPVEYOR_BUILD_FOLDER/r2_dist" \
-	-DRADARE2_INSTALL_PLUGDIR="$APPVEYOR_BUILD_FOLDER/r2_dist/lib/plugins" \
-	-DBUILD_SLEIGH_PLUGIN=OFF

scripts/breakpad_client.gyp

@@ -1,34 +0,0 @@
-{
-    'includes': [
-        '../../build/common.gypi'
-    ],
-    'targets': [
-        {
-            'target_name': 'build_all',
-            'type': 'none',
-            'dependencies': [
-                './crash_generation/crash_generation.gyp:*',
-                './handler/exception_handler.gyp:*',
-                './sender/crash_report_sender.gyp:*',
-            ]
-        },
-        {
-            'target_name': 'common',
-            'type': 'static_library',
-            'include_dirs': [
-                '<(DEPTH)',
-            ],
-            'direct_dependent_settings': {
-                'include_dirs': [
-                    '<(DEPTH)',
-                ]
-            },
-            'sources': [
-                '<(DEPTH)/common/windows/guid_string.cc',
-                '<(DEPTH)/common/windows/guid_string.h',
-                '<(DEPTH)/common/windows/http_upload.h',
-                '<(DEPTH)/common/windows/string_utils.cc',
-            ]
-        }
-    ]
-}

scripts/breakpad_extract_symbols_appimage.py

@@ -1,55 +0,0 @@
-
-import sys
-import os
-import subprocess
-import re
-import atexit
-
-if len(sys.argv) != 3:
-	print(f"usage: {sys.argv[0]} [Iaito.AppImage] [symbols dir]")
-	exit(1)
-
-root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
-
-def store_syms(syms, syms_dir):
-	m = re.match(b"MODULE ([^ ]+) ([^ ]+) ([^ ]+) (.+)\n.*", syms)
-	if m is None:
-		print("Invalid dump_syms output")
-		return
-	
-	(modos, modarch, modhash, modname) = m.groups()
-	modname = modname.decode("utf-8")
-	modhash = modhash.decode("utf-8")
-	symdir = os.path.join(syms_dir, modname, modhash)
-	symfile = f"{modname}.sym"
-	os.makedirs(symdir)
-	symfile_path = os.path.join(symdir, symfile)
-	with open(symfile_path, "wb") as f:
-		f.write(syms)
-
-	print(symfile_path)
-
-def dump_syms(binary, syms_dir):
-	dump_syms_exec = os.path.join(root, "breakpad/src/tools/linux/dump_syms/dump_syms")
-	syms = subprocess.run([dump_syms_exec, binary], capture_output=True).stdout
-	store_syms(syms, syms_dir)
-
-appimage = sys.argv[1]
-syms_dst = sys.argv[2]
-
-# stdbuf workaround is needed before https://github.com/AppImage/AppImageKit/commit/e827baa719f5444aeef7202fe1f71c97d4200dde
-appimage_p = subprocess.Popen(["stdbuf", "-oL", appimage, "--appimage-mount"], stdout=subprocess.PIPE)
-def kill_appimage():
-	appimage_p.kill()
-atexit.register(kill_appimage)
-mount_dir = appimage_p.stdout.readline().strip().decode("utf-8")
-
-binaries = [ os.path.join(mount_dir, "usr/bin/Iaito") ]
-for f in os.scandir(os.path.join(mount_dir, "usr/lib")):
-	if f.is_dir() or f.is_symlink():
-		continue
-	binaries.append(f.path)
-
-for b in binaries:
-	dump_syms(b, syms_dst)
-

scripts/bundle_openssl.ps1

@@ -1,6 +0,0 @@
-$arch = $args[0]
-$dist = $args[1]
-
-$libpath = If ($arch -eq "x64") {"C:\OpenSSL-Win64\bin"} Else {"C:\OpenSSL-Win32\bin"}
-Copy-Item $libpath\libeay32.dll -Destination $dist
-Copy-Item $libpath\ssleay32.dll -Destination $dist

scripts/bundle_python.ps1

@@ -1,17 +0,0 @@
-$arch = $args[0]
-$dist = $args[1]
-
-$py_version = (python --version).Split()[1]
-$py_base = "python" + $py_version[0] + $py_version[2]
-$py_platform = If ($arch -eq "x64") {"amd64"} Else {"win32"}
-$py_url = "https://www.python.org/ftp/python/${py_version}/python-${py_version}-embed-${py_platform}.zip"
-
-Remove-Item .\python_embed -Recurse -ErrorAction SilentlyContinue
-$ErrorActionPreference = 'Stop'
-[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget ${py_url} -OutFile python_embed.zip; Expand-Archive .\python_embed.zip -DestinationPath .\python_embed
-New-Item -ItemType directory -Force -Path $dist\$py_base
-Copy-Item .\python_embed\${py_base}.zip -Destination $dist\$py_base
-Copy-Item .\python_embed\*.pyd -Destination $dist\$py_base
-Copy-Item .\python_embed\sqlite3.dll -Destination $dist\$py_base
-Copy-Item .\python_embed\python*.dll -Destination $dist
-[System.IO.File]::WriteAllLines("${dist}\${py_base}._pth", "${py_base}`r`n${py_base}\${py_base}.zip`r`n${py_base}\site-packages")

scripts/bundle_r2dec.ps1

@@ -1,8 +1,10 @@
+# This script is deprecated and it is not going to work
+# But it's kept for future work towards supporting it again
 $dist = $args[0]
 $python = Split-Path((Get-Command python.exe).Path)
 
 if (-not (Test-Path -Path 'r2dec-js' -PathType Container)) {
-    git clone https://github.com/radareorg/r2dec-js.git --branch master --depth 1
+    git clone https://github.com/wargio/r2dec-js.git --branch master --depth 1
 }
 cd r2dec-js
 #git checkout b5a0d15c7bcc488f268ffb0931b7ced2919f6c9d

scripts/deeplink/register.bat

@@ -0,0 +1,14 @@
+@echo off
+rem Register the iaito:// URI scheme handler for the current user.
+rem Usage: register.bat [path-to-iaito.exe]
+
+setlocal
+set "IAITO=%~1"
+if "%IAITO%"=="" set "IAITO=%~dp0..\..\build\iaito.exe"
+
+reg add "HKCU\Software\Classes\iaito" /ve /d "URL:iaito Protocol" /f
+reg add "HKCU\Software\Classes\iaito" /v "URL Protocol" /d "" /f
+reg add "HKCU\Software\Classes\iaito\DefaultIcon" /ve /d "\"%IAITO%\",0" /f
+reg add "HKCU\Software\Classes\iaito\shell\open\command" /ve /d "\"%IAITO%\" \"%%1\"" /f
+echo Registered iaito:// -^> %IAITO%
+endlocal

scripts/deeplink/register.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+# Register the iaito:// URI scheme handler on Linux and macOS.
+# Usage: register.sh [path-to-iaito.app]   (the argument is only used on macOS)
+
+case "$(uname)" in
+Darwin)
+	APP="$1"
+	[ -d "$APP" ] || APP="/Applications/iaito.app"
+	[ -d "$APP" ] || APP="$HOME/Applications/iaito.app"
+	if [ ! -d "$APP" ]; then
+		echo "Cannot find iaito.app, pass its path as first argument" >&2
+		exit 1
+	fi
+	LSREG="/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister"
+	"$LSREG" -f "$APP"
+	echo "Registered iaito:// for $APP"
+	;;
+*)
+	DESKTOP="org.radare.iaito.desktop"
+	if command -v xdg-mime >/dev/null 2>&1; then
+		xdg-mime default "$DESKTOP" x-scheme-handler/iaito
+	fi
+	if command -v update-desktop-database >/dev/null 2>&1; then
+		update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true
+	fi
+	echo "Registered iaito:// -> $DESKTOP"
+	;;
+esac

scripts/deeplink/unregister.bat

@@ -0,0 +1,4 @@
+@echo off
+rem Unregister the iaito:// URI scheme handler for the current user.
+reg delete "HKCU\Software\Classes\iaito" /f
+echo Unregistered iaito://

scripts/deeplink/unregister.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# Unregister the iaito:// URI scheme handler on Linux and macOS.
+
+case "$(uname)" in
+Darwin)
+	echo "macOS drops the iaito:// handler when the iaito.app bundle is removed."
+	;;
+*)
+	MIMEAPPS="$HOME/.config/mimeapps.list"
+	if [ -f "$MIMEAPPS" ]; then
+		sed -i.bak '/x-scheme-handler\/iaito=/d' "$MIMEAPPS"
+		rm -f "$MIMEAPPS.bak"
+	fi
+	if command -v update-desktop-database >/dev/null 2>&1; then
+		update-desktop-database "$HOME/.local/share/applications" 2>/dev/null || true
+	fi
+	echo "Unregistered iaito:// handler"
+	;;
+esac

scripts/deploy_docs.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-cd $(dirname "${BASH_SOURCE[0]}")/..
-
-cutter_timestamp=$(git show -s --format=%ct)
-cutter_commit="$(git show -s --format="%H %s")"
-
-echo "Cloning current cutter.re"
-
-git clone --depth 1 [email protected]:radareorg/cutter.re.git || exit 1
-
-echo "Updating docs"
-
-rm -rf cutter.re/docs
-cp -a docs/build/html cutter.re/docs || exit 1
-
-echo "Committing new changes"
-
-cd cutter.re || exit 1
-docs_timestamp=$(git show -s --format=%ct)
-if [ $docs_timestamp -ge $cutter_timestamp ]; then
-	echo "Last commit on cutter.re is newer than this commit on cutter. Skipping."
-	exit 0
-fi
-
-git add . || exit 1
-git diff --cached --quiet && echo "No changes." && exit 0
-printf "Update docs from radareorg/cutter\n\nOriginal Commit:\n$cutter_commit" | git commit -F -
-git push origin master || exit 1
-

scripts/deploy_translations.sh

@@ -12,7 +12,7 @@ log "Script started"
 # Update submodule
 log "Updating translations..."
 cd ${TRAVIS_BUILD_DIR}/src
-git submodule update translations
+[ -d translations ] || git clone git clone https://github.com/radareorg/iaito-translations.git translations
 cd translations
 git pull origin master
 

scripts/dump_syms.gyp

@@ -1,17 +0,0 @@
-{
-    'includes': [
-        '../../../build/common.gypi',
-    ],
-    'targets': [
-        {
-            'target_name': 'dump_syms',
-            'type': 'executable',
-            'sources': [
-                'dump_syms.cc',
-            ],
-            'dependencies': [
-                '../../../common/windows/common_windows.gyp:common_windows_lib',
-            ],
-        },
-    ],
-}

scripts/dump_syms_macos.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-if [ ! $# -eq 2 ]; then
-	echo "usage: $0 [Iaito.app] [dst]"
-	exit 1
-fi
-
-appbundle="$1"
-dst="$2"
-files="$appbundle/Contents/MacOS/Iaito.bin $appbundle/Contents/Frameworks/Python.framework/Python $(find "$appbundle" -type f -name '*.dylib')"
-
-mkdir -p "$dst" || exit 1 
-
-for file in $files; do
-	echo "Dumping syms from $file"
-	dump_syms "$file" > "$dst/tmp.sym" || echo "Failed to dump syms from $file"
-	infoline=($(head -n1 "$dst/tmp.sym"))
-	id=${infoline[3]}
-	name=${infoline[4]}
-	dir="$dst/$name/$id"
-	mkdir -p "$dir"
-	mv "$dst/tmp.sym" "$dir/$name.sym"
-done
-
-echo "Done"
-

scripts/fetch_deps.sh

@@ -1,56 +0,0 @@
-#!/bin/bash
-
-cd $(dirname "${BASH_SOURCE[0]}")/..
-mkdir -p cutter-deps && cd cutter-deps
-
-LINUX_FILE="cutter-deps-linux.tar.gz"
-LINUX_MD5=31fd19443a3405d6b6097cbbd4c11fba
-LINUX_URL=https://github.com/rizinorg/cutter-deps/releases/download/v12/cutter-deps-linux.tar.gz
-
-MACOS_FILE="cutter-deps-macos.tar.gz"
-MACOS_MD5=e75041c04fc806437723a399028402af
-MACOS_URL=https://github.com/rizinorg/cutter-deps/releases/download/v12/cutter-deps-macos.tar.gz
-
-WIN_FILE="cutter-deps-win.tar.gz"
-WIN_MD5=7c755404140f2e9945bfc13d2e645bb1
-WIN_URL=https://github.com/rizinorg/cutter-deps/releases/download/v12/cutter-deps-win.tar.gz
-
-if [ "$OS" == "Windows_NT" ]; then
-	FILE="${WIN_FILE}"
-	MD5="${WIN_MD5}"
-	URL="${WIN_URL}"
-else
-	UNAME_S="$(uname -s)"
-	if [ "$UNAME_S" == "Linux" ]; then
-		FILE="${LINUX_FILE}"
-		MD5="${LINUX_MD5}"
-		URL="${LINUX_URL}"
-	elif [ "$UNAME_S" == "Darwin" ]; then
-		FILE="${MACOS_FILE}"
-		MD5="${MACOS_MD5}"
-		URL="${MACOS_URL}"
-	else
-		echo "Unsupported Platform: uname -s => $UNAME_S, \$OS => $OS"
-		exit 1
-	fi
-fi
-
-curl -L "$URL" -o "$FILE" || exit 1
-
-if [ "$UNAME_S" == "Darwin" ]; then
-	if [ "$(md5 -r "$FILE")" != "$MD5 $FILE" ]; then \
-		echo "MD5 mismatch for file $FILE"; \
-		exit 1; \
-	else \
-	        echo "$FILE OK"; \
-	fi
-else
-	echo "$MD5 $FILE" | md5sum -c - || exit 1
-fi
-
-tar -xf "$FILE" || exit 1
-
-if [ -f relocate.sh ]; then
-	./relocate.sh || exit 1
-fi
-

scripts/get_version.py

@@ -1,4 +1,4 @@
-
+#!/usr/bin/env python3
 import os
 import re
 

scripts/indent/Dockerfile

@@ -0,0 +1,6 @@
+FROM ubuntu:24.04
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y --no-install-recommends clang-format-20 \
+    && rm -rf /var/lib/apt/lists/*
+WORKDIR /project
+ENTRYPOINT ["clang-format-20"]

scripts/indent/Makefile

@@ -0,0 +1,5 @@
+IMAGE_NAME ?= clang-format-image
+IMAGE_TAG ?= llvm20
+
+all:
+	docker build -t $(IMAGE_NAME):$(IMAGE_TAG) .

scripts/meson_configure_qmake_in.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 
 import sys
 import re

scripts/meson_parse_qmake.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import os
 import sys
 

scripts/prepare_breakpad.bat

@@ -1,33 +0,0 @@
-@ECHO OFF
-SET ROOT_DIR=%CD%
-
-powershell -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; wget https://storage.googleapis.com/chrome-infra/depot_tools.zip -OutFile depot_tools.zip "
-7z -bd x %ROOT_DIR%\depot_tools.zip -odepot_tools
-powershell -Command "depot_tools\update_depot_tools"
-SET BUFF_PATH=%PATH%
-SET DEPOT_TOOLS=%ROOT_DIR%\depot_tools
-set PATH=%DEPOT_TOOLS%;%BUFF_PATH%
-
-mkdir %ROOT_DIR%\src\breakpad
-CD %ROOT_DIR%\src\breakpad
-powershell -Command "fetch breakpad"
-powershell -Command "gclient sync"
-CD %ROOT_DIR%\src\breakpad\src
-powershell -Command "git reset --hard 756daa536ad819eff80172aaab262fb71d1e89fd"
-
-CD %ROOT_DIR%\src\breakpad\src\src\client\windows
-DEL %CD%\breakpad_client.gyp
-DEL %CD%\breakpad_client.sln
-DEL %CD%\common.vcxproj
-DEL %CD%\common.vcxproj.filters
-DEL %CD%\build_all.vcxproj
-COPY %ROOT_DIR%\scripts\breakpad_client.gyp %CD%
-
-CD %ROOT_DIR%\src\breakpad\src\src
-SET GYP_MSVS_VERSION=2017
-powershell -Command "tools\gyp\gyp.bat --no-circular-check client\windows\breakpad_client.gyp -Dwin_release_RuntimeLibrary=2 -Dwin_debug_RuntimeLibrary=2  -Dplatform=%ARCH% -Dconfiguration=release"
-devenv client\windows\breakpad_client.sln /upgrade
-
-set PATH=%BUFF_PATH%
-msbuild /m %CD%\client\windows\breakpad_client.sln /p:Configuration=release /p:Platform=%ARCH% || exit /b 1
-CD %ROOT_DIR%

scripts/prepare_breakpad_linux.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -euo pipefail
-
-git clone https://github.com/google/breakpad.git
-cd breakpad
-git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
-CFLAGS=-w CXXFLAGS=-w ./configure --disable-tools --prefix=`pwd`/prefix && make -j4 && make install || exit 1
-
-export CUSTOM_BREAKPAD_PREFIX="`pwd`/prefix"
-cd ..

scripts/prepare_breakpad_macos.sh

@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -euo pipefail
-
-SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-DIR="$SCRIPTPATH/.."
-cd "$DIR"
-BREAKPAD_FRAMEWORK_DIR="$DIR/breakpad/framework"
-BREAKPAD_DUMP_SYMS_DIR="$DIR/breakpad/bin"
-git clone https://github.com/google/breakpad.git
-mkdir $BREAKPAD_FRAMEWORK_DIR
-mkdir $BREAKPAD_DUMP_SYMS_DIR
-cd breakpad
-git checkout 4d550cceca107f36c4bc1ea1126b7d32cc50f424
-git apply "$SCRIPTPATH/breakpad_macos.patch"
-cd src/client/mac/ && xcodebuild -sdk macosx
-cp -R build/Release/Breakpad.framework "$BREAKPAD_FRAMEWORK_DIR"
-
-cd $DIR/breakpad
-cp -R src/. framework/Breakpad.framework/Headers
-
-export BREAKPAD_FRAMEWORK_DIR=$BREAKPAD_FRAMEWORK_DIR
-cd $DIR

scripts/prepare_python_macos.sh

@@ -1,25 +0,0 @@
-#!/bin/bash
-
-SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-mkdir python && cd python
-
-wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" || exit 1
-tar -xf Python-3.6.4.tar.xz || exit 1
-
-export PYTHON_FRAMEWORK_DIR="`pwd`/framework"
-
-cd Python-3.6.4 || exit 1
-
-CPPFLAGS="-I$(brew --prefix openssl)/include" LDFLAGS="-L$(brew --prefix openssl)/lib" ./configure --enable-framework=$PYTHON_FRAMEWORK_DIR || exit 1
-
-# Patch for https://github.com/radareorg/cutter/issues/424
-sed -i ".original" "s/#define HAVE_GETENTROPY 1/#define HAVE_GETENTROPY 0/" pyconfig.h
-
-make -j4 || exit 1
-make frameworkinstallframework > /dev/null || exit 1
-
-PYTHONHOME=$PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current \
-       $PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current/bin/pip3 install -r "$SCRIPTPATH/pip_requirements.txt" || exit 1
-
-cd ../..

scripts/r2dec.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-cd "$SCRIPTPATH/.."
-
-if [[ ! -d r2dec-js ]]; then
-	git clone https://github.com/radareorg/r2dec-js.git --depth 1 --branch master
-	#cd r2dec-js
-	#git checkout b5a0d15c7bcc488f268ffb0931b7ced2919f6c9d
-	#cd ..
-fi
-
-cd r2dec-js
-rm -rf build
-mkdir build && cd build
-meson --buildtype=release --libdir=share/radare2/plugins --datadir=share/radare2/plugins "$@" ../p
-ninja
-ninja install
-

scripts/r2ghidra.sh

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
-
-cd "$SCRIPTPATH/.."
-
-if [[ ! -d r2ghidra ]]; then
-    # remove depth, branch and uncomment lines bellow to use specifc commit
-    git clone --recurse-submodules https://github.com/radareorg/r2ghidra.git  --depth 1  --branch master || exit 1
-    #pushd r2ghidra
-    #git checkout  --recurse-submodules 5e845f4b50e8559bd51af03b22b6586e8cc5c35c
-    #popd
-fi
-cd r2ghidra || exit 1
-
-mkdir build && cd build || exit 1
-cmake -G Ninja "$@" .. || exit 1
-ninja || exit 1
-ninja install || exit 1
-

scripts/release-notes.sh

@@ -0,0 +1,91 @@
+#!/bin/sh
+#
+# This script parses the commit messages between the last 2 git tags
+# if the last commit contains the word "Release", otherwise it shows
+# all the changes between the last tag and HEAD.
+#
+# Commits are grouped in different sections specified in the commit
+# message with the middle-dot character '·'. The section names are
+# arbitrary and we may be careful to use them properly but having
+# in mind that this may change.
+#
+# Commits without any middle·dot in the message are discarted and
+# displayed in the "to review" section.
+#
+# The tool prints Markdown, no plans to support other formats.
+#
+# Usage: sys/release-notes.sh 4.5.1      # from HEAD to 4.5.1
+#   $ sys/release-notes.sh 4.5.1 -v      # same as above but include untagged commits
+#   $ sys/release-notes.sh 4.5.0 4.5.1   # from 4.5.0 to 4.5.1
+#
+# --pancake
+
+if [ -n "`git log -n 1 | grep Release`" ]; then
+	VERS=`git tag --sort=committerdate | grep -v conti | tail -n 1`
+	PREV=`git tag --sort=committerdate | grep -v conti | tail -n 2 | head -n1`
+else
+	VERS=HEAD
+	PREV=`git tag --sort=committerdate | grep -v conti | tail -n 1`
+fi
+
+[ -n "$1" ] && PREV="$1"
+[ -n "$2" ] && VERS="$2"
+
+git log ${PREV}..${VERS} > .l
+# When HEAD contains a tag do this magic
+if [ ! -s .l ]; then
+  VERS=$PREV
+  PREV=`git tag --sort=committerdate | grep -v conti | tail -n 2 | head -n1`
+  git log ${PREV}..${VERS} > .l
+fi
+grep ^Author .l | cut -d : -f 2- | sed -e 's,radare,pancake,' | sort -u > .A
+
+echo "## Release Notes"
+echo
+echo "Version: ${VERS} (previous: ${PREV})"
+N=`grep ^commit .l | wc -l`
+echo "Commits: $N from `wc -l .A | awk '{print $1}'` contributors"
+echo
+echo "Release builds (binary assets below) are considered work-in-progress, use flatpak or your distro packaging if anything is not working"
+echo
+echo "## Flatpak (WSL / Linux)"
+echo
+echo "\`\`\`sh"
+echo "sudo flatpak remote-add flathub https://dl.flathub.org/repo/flathub.flatpakrepo"
+echo "sudo flatpak install flathub org.radare.iaito"
+echo "flatpak run org.radare.iaito"
+echo "\`\`\`"
+echo
+echo "## Build from Source"
+echo
+echo "\`\`\`sh"
+echo "curl -sL https://github.com/radareorg/iaito/archive/refs/tags/${VERS}.tar.gz | tar xzv"
+echo "iaito-${VERS}/sys/install.sh"
+echo "\`\`\`"
+echo
+echo "## Highlights"
+
+echo "<details><summary>More details</summary><p>"
+echo
+echo "## Authors"
+echo
+cat .A | perl -ne '/([^<]+)(.*)$/;$a=$1;$b=$2;$a=~s/^\s+|\s+$//g;$b=~s/[<>\s]//g;print "[$a](mailto:$b) "'
+echo
+echo
+
+cat .x | grep -v '##' | sed -e 's,^ *,,g' | grep -v "^$" | \
+      perl -ne 'if (/^\*/) { print "$_"; } else { print "* $_";}'
+
+# echo "## Changes"
+# echo
+# cat .l | grep -v ^commit | grep -v ^Author | grep -v ^Date > .x
+# cat .x | grep '##' | perl -ne '/##([^ ]*)/; if ($1) {print "$1\n";}' | sort -u > .y
+# for a in `cat .y` ; do
+# 	echo "**$a**"
+# 	echo
+# 	cat .x | grep "##$a" | sed -e 's/##.*//g' | perl -ne '{ s/^\s+//; print "* $_"; }'
+# 	echo
+# done
+# rm -f .x .y .l .A
+
+echo '</p></details>'

scripts/source_bat.bash

@@ -1,64 +0,0 @@
-# Copyright 2019 Wason Technology, LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-if [ $# -eq 0 ]
-  then
-    echo "No bat file specified"
-    return
-fi
-
-#echo `dirname "$(readlink -f "$_")"`
-___update_env_func___() {
-tmpbat=$(mktemp --suffix .bat)
-rc=$?; if [[ $rc != 0 ]]; then 
-  echo "Could not create temporary bat file"
-  return $rc 
-fi
-
-echo "@echo off " >> $tmpbat
-echo "call \"$@\" 1>&2 " >> $tmpbat
-echo "if %errorlevel% neq 0 exit /b %errorlevel%" >> $tmpbat
-echo "printenv " >> $tmpbat
-echo "if %errorlevel% neq 0 exit /b %errorlevel%" >> $tmpbat
-rc=$?; if [[ $rc != 0 ]]; then 
-  echo "Could not write temporary bat file"
-  return $rc
-fi
-
-tmpbat_win=$(basename $tmpbat)
-env_data=$(cmd "/c call %TEMP%\\$tmpbat_win ")
-rc=$?; if [[ $rc != 0 ]]; then 
-  echo "Could not run temporary bat file"
-  return $rc 
-fi
-
-echo
-echo
-echo
-
-#Space at the end is lost for some reason,
-#save and restore PS1
-ps1_old=$PS1
-
-while read -r line; do
-    echo "export $line"
-    export "$line"     
-done <<< "$env_data"
-
-export PS1="$ps1_old"
-}
-
-___update_env_func___ $@
-unset -f ___update_env_func___
-cd `pwd`

scripts/subst.sh

@@ -0,0 +1,21 @@
+#!/bin/sh
+a="$1"
+b="$2"
+if [ -z "$a" ]; then
+	echo "Usage: sys/subst.sh [old] [new]"
+	exit 1
+fi
+#[ -z "$a" ] && a="r_str_chop "
+#[ -z "$b" ] && b="r_str_trim "
+WHERE="src"
+git grep "$a" ${WHERE} | less -R
+if [ -n "$b" ]; then
+	FILES=`git grep "$a" ${WHERE} | cut -d : -f 1 | uniq `
+	for f in $FILES ; do
+		echo "Sedded $a"
+		sed -e "s/$a/$b/g" < $f > $f.sub
+		mv $f.sub $f
+	done
+else
+	echo "Oops"
+fi

scripts/transai.py

@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+import xml.etree.ElementTree as ET
+import subprocess
+import sys
+
+def remove_lines_with_dashes(input_string):
+    lines = input_string.splitlines()
+    filtered_lines = [line for line in lines if "----------" not in line]
+    return "\n".join(filtered_lines).strip()
+
+# Define the translation function
+def translate_text(input_text, existing_translation, language):
+    """
+    Calls an external program to translate the input text, using existing translation if provided.
+
+    Args:
+        input_text (str): The text to translate.
+        existing_translation (str): The existing translation to provide context.
+
+    Returns:
+        str: The translated text.
+    """
+    inspiration = ""
+    if existing_translation and existing_translation != "":
+        inspiration = ". Take this original text as inspiration: '"+existing_translation+"'"
+    try:
+        # Replace 'translation_program' with the actual program/command
+        process = subprocess.Popen(
+            ['/usr/local/bin/ai', '--', '"translate this sentence to '+language+', the output must be just the text, the context for this translation is the Iaito program, which is the graphical interface for radare2, a reverse engineering tool for analyzing and debugging programs'+inspiration+'"'],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True
+        )
+        print('"translate this sentence to '+language+', the output must be just the text, the context for this translation is the Iaito program, which is the graphical interface for radare2, a reverse engineering tool for analyzing and debugging programs'+inspiration+'"')
+        input_data = f"{input_text}"
+        stdout, stderr = process.communicate(input=input_data)
+
+        if process.returncode != 0:
+            raise RuntimeError(f"Translation program error: {stderr.strip()}")
+
+        print(stdout)
+        return remove_lines_with_dashes(stdout)
+    except Exception as e:
+        print(f"Error during translation: {e}", file=sys.stderr)
+        return input_text  # Fallback to the original text if an error occurs
+
+# Define the function to find existing translation
+def find_existing_translation(existing_tree, source_text):
+    """
+    Finds the translation for a given source text in an existing .ts file.
+
+    Args:
+        existing_tree (ElementTree): Parsed XML tree of the existing .ts file.
+        source_text (str): The source text to look for.
+
+    Returns:
+        str: The existing translation if found, else an empty string.
+    """
+    for context in existing_tree.findall('context'):
+        for message in context.findall('message'):
+            source = message.find('source')
+            translation = message.find('translation')
+            if source is not None and source.text == source_text and translation is not None:
+                return translation.text
+    return ""
+
+# Define the main function to parse and modify the XML file
+def process_ts_file(input_file, output_file, existing_file, language):
+    """
+    Parses the .ts file, adds a <translation> node with translated content, and writes the output.
+
+    Args:
+        input_file (str): Path to the input .ts file.
+        output_file (str): Path to save the modified .ts file.
+        existing_file (str): Path to an existing .ts file to find previous translations.
+    """
+    tree = ET.parse(input_file)
+    root = tree.getroot()
+
+    existing_tree = ET.parse(existing_file)
+
+    for context in root.findall('context'):
+        for message in context.findall('message'):
+            source = message.find('source')
+            if source is not None and source.text:
+                original_text = source.text
+                existing_translation = find_existing_translation(existing_tree, original_text)
+                translated_text = translate_text(original_text, existing_translation, language)
+                # Check if <translation> node exists, if not create it
+                translation = message.find('translation')
+                if translation is None:
+                    translation = ET.SubElement(message, 'translation')
+                translation.text = translated_text
+                if 'type' in translation.attrib:
+                    del translation.attrib['type']
+
+    # Save the updated XML to the output file
+    tree.write(output_file, encoding='utf-8', xml_declaration=True)
+
+if __name__ == "__main__":
+    if len(sys.argv) <= 4:
+        print("Usage: python script.py input.ts output.ts existing.ts (Language)", file=sys.stderr)
+        sys.exit(1)
+
+    input_ts = sys.argv[1]
+    output_ts = sys.argv[2]
+    existing_ts = sys.argv[3]
+    if len(sys.argv) <= 5:
+        language = sys.argv[4]
+
+    process_ts_file(input_ts, output_ts, existing_ts, language)
+    print(f"Translated file saved to {output_ts}")
+

scripts/update_deps.py

@@ -1,46 +0,0 @@
-
-import sys
-import os
-import requests
-import re
-import subprocess
-
-platforms = ["linux", "macos", "win"]
-
-if sys.platform == "darwin":
-	md5sum_cmd = ["md5", "-r"]
-else:
-	md5sum_cmd = ["md5sum"]
-
-fetch_deps_path = os.path.join(os.path.dirname(sys.argv[0]), "fetch_deps.sh")
-
-print("Fetching latest release")
-json = requests.get("https://api.github.com/repos/radareorg/cutter-deps/releases/latest").json()
-
-release_url = json["assets"][0]["browser_download_url"]
-for platform in platforms:
-	release_url = release_url.replace(platform, "${PLATFORM}")
-
-with open(fetch_deps_path) as f:
-	fetch_deps = f.read()
-
-md5 = {}
-for platform in platforms:
-	platform_url = release_url.replace("${PLATFORM}", platform)
-	print(f"Getting MD5 for {platform_url}")
-
-	curl = subprocess.Popen(["curl", "-fL", platform_url], stdout=subprocess.PIPE)
-	md5sum = subprocess.run(md5sum_cmd, stdin=curl.stdout, capture_output=True, encoding="utf-8").stdout
-	curl.wait()
-	if curl.returncode != 0:
-		print(f"Failed to download {platform_url}, skipping.")
-		continue
-
-	md5sum = re.fullmatch("([a-zA-Z0-9]+)( +-)?\n?", md5sum).group(1)
-
-	print(f"MD5: {md5sum}")
-	fetch_deps = re.sub(f"^{platform.upper()}_URL=.*$", f"{platform.upper()}_URL={platform_url}".replace("\\", r"\\"), fetch_deps, flags=re.MULTILINE)
-	fetch_deps = re.sub(f"^{platform.upper()}_MD5=.*$", f"{platform.upper()}_MD5={md5sum}".replace("\\", r"\\"), fetch_deps, flags=re.MULTILINE)
-
-with open(fetch_deps_path, "w") as f:
-	f.write(fetch_deps)

src/CMakeLists.txt

@@ -1,316 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-endif()
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-include(DisallowInSource)
-include(Utils)
-
-set(IAITO_PYTHON_MIN 3.5)
-
-set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-
-option(IAITO_USE_BUNDLED_RADARE2 "Use radare2 from src/radare2 submodule instead of searching for it on the system" OFF)
-option(IAITO_USE_ADDITIONAL_RADARE2_PATHS "Search radare2 in additional paths which are not part of default system library paths.\
- Disable this option if you are linking against radare2 pacakged as proper system library or in a custom path and additional are paths causing problems." ON)
-option(IAITO_ENABLE_PYTHON "Enable Python integration. Requires Python >= ${IAITO_PYTHON_MIN}." OFF)
-option(IAITO_ENABLE_PYTHON_BINDINGS "Enable generating Python bindings with Shiboken2. Unused if IAITO_ENABLE_PYTHON=OFF." OFF)
-option(IAITO_ENABLE_CRASH_REPORTS "Enable crash report system. Unused if IAITO_ENABLE_CRASH_REPORTS=OFF" OFF)
-option(IAITO_APPIMAGE_BUILD "Enable Appimage specific changes. Doesn't cause building of Appimage itself." OFF)
-tri_option(IAITO_ENABLE_KSYNTAXHIGHLIGHTING "Use KSyntaxHighlighting" AUTO)
-tri_option(IAITO_ENABLE_GRAPHVIZ "Enable use of graphviz for graph layout" AUTO)
-set(SHIBOKEN_EXTRA_OPTIONS "" CACHE STRING "Extra options for shiboken generator")
-set(IAITO_EXTRA_PLUGIN_DIRS "" CACHE STRING "List of addition plugin locations")
-option(IAITO_ENABLE_DEPENDENCY_DOWNLOADS "Enable downloading of dependencies. Setting to OFF doesn't affect any downloads done by r2 build." OFF)
-option(IAITO_PACKAGE_DEPENDENCIES "During install step include the third party dependencies." OFF)
-option(IAITO_PACKAGE_R2GHIDRA "Compile and install r2ghidra during install step." OFF)
-option(IAITO_PACKAGE_R2DEC "Compile and install r2dec during install step." OFF)
-OPTION(IAITO_QT6 "Use QT6" OFF)
-
-if(NOT IAITO_ENABLE_PYTHON)
-    set(IAITO_ENABLE_PYTHON_BINDINGS OFF)
-endif()
-
-# Parse Iaito.pro to get filenames
-include(QMakeProParse)
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Iaito.pro"
-        "${CMAKE_CURRENT_BINARY_DIR}/Iaito.pro"
-        COPYONLY) # trigger reconfigure if Iaito.pro changes
-parse_qmake_pro("${CMAKE_CURRENT_BINARY_DIR}/Iaito.pro" IAITO_PRO)
-set(SOURCE_FILES ${IAITO_PRO_SOURCES})
-set(HEADER_FILES ${IAITO_PRO_HEADERS})
-set(UI_FILES ${IAITO_PRO_FORMS})
-set(QRC_FILES ${IAITO_PRO_RESOURCES})
-set(IAITO_VERSION_MAJOR "${IAITO_PRO_IAITO_VERSION_MAJOR}")
-set(IAITO_VERSION_MINOR "${IAITO_PRO_IAITO_VERSION_MINOR}")
-set(IAITO_VERSION_PATCH "${IAITO_PRO_IAITO_VERSION_PATCH}")
-
-set(IAITO_VERSION_FULL "${IAITO_VERSION_MAJOR}.${IAITO_VERSION_MINOR}.${IAITO_VERSION_PATCH}")
-
-project(iaito VERSION "${IAITO_VERSION_FULL}")
-
-set(CMAKE_CXX_STANDARD 11)
-
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTOUIC ON)
-set(CMAKE_AUTORCC ON)
-if (IAITO_QT6)
-    set(QT_PREFIX Qt6)
-else()
-    set(QT_PREFIX Qt5)
-endif()
-find_package(${QT_PREFIX} REQUIRED COMPONENTS Core Widgets Gui Svg Network)
-
-include(IaitoInstallDirs)
-
-if(IAITO_USE_BUNDLED_RADARE2)
-    include(BundledRadare2)
-    set(RADARE2_TARGET Radare2)
-else()
-    find_package(Radare2 REQUIRED)
-    set(RADARE2_TARGET Radare2::libr)
-endif()
-
-if(IAITO_ENABLE_PYTHON)
-    find_package(PythonInterp REQUIRED)
-    find_package(PythonLibs ${IAITO_PYTHON_MIN} REQUIRED)
-
-    include_directories(${PYTHON_INCLUDE_DIRS})
-    add_definitions(-DIAITO_ENABLE_PYTHON)
-
-    if(IAITO_ENABLE_PYTHON_BINDINGS)
-        # 5.12.3 => 5.12
-        if("${Qt5_VERSION}" MATCHES "^([0-9]+\\.[0-9]+)\\.[0-9]+")
-            set(Shiboken2_VERSION_REQUIRED "${CMAKE_MATCH_1}")
-        else()
-            message(FATAL_ERROR "Failed to recognize Qt version")
-        endif()
-        find_package(Shiboken2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED)
-        find_package(PySide2 "${Shiboken2_VERSION_REQUIRED}" REQUIRED)
-
-        get_target_property(PYSIDE_INCLUDE_DIR PySide2::pyside2 INTERFACE_INCLUDE_DIRECTORIES)
-        list(GET PYSIDE_INCLUDE_DIR 0 PYSIDE_INCLUDE_DIR)
-        include_directories(${PYSIDE_INCLUDE_DIR}
-            ${PYSIDE_INCLUDE_DIR}/QtCore
-            ${PYSIDE_INCLUDE_DIR}/QtGui
-            ${PYSIDE_INCLUDE_DIR}/QtWidgets)
-
-        add_definitions(-DIAITO_ENABLE_PYTHON_BINDINGS)
-    endif()
-endif()
-
-if(IAITO_ENABLE_KSYNTAXHIGHLIGHTING)
-    if(IAITO_ENABLE_KSYNTAXHIGHLIGHTING STREQUAL AUTO)
-        find_package(KF5SyntaxHighlighting)
-        if(KF5SyntaxHighlighting_FOUND)
-            set(KSYNTAXHIGHLIGHTING_STATUS ON)
-        else()
-            set(KSYNTAXHIGHLIGHTING_STATUS "OFF (KSyntaxHighlighting not found)")
-        endif()
-    else()
-        find_package(KF5SyntaxHighlighting REQUIRED)
-        set(KSYNTAXHIGHLIGHTING_STATUS ON)
-    endif()
-else()
-    set(KSYNTAXHIGHLIGHTING_STATUS OFF)
-endif()
-
-if (IAITO_ENABLE_GRAPHVIZ)
-    if (IAITO_ENABLE_GRAPHVIZ STREQUAL AUTO)
-        find_package(Graphviz)
-    else()
-        find_package(Graphviz REQUIRED)
-    endif()
-    set (IAITO_ENABLE_GRAPHVIZ ${Graphviz_FOUND})
-endif()
-
-message(STATUS "")
-message(STATUS "Building Iaito version ${IAITO_VERSION_FULL}")
-message(STATUS "Options:")
-message(STATUS "- Bundled radare2: ${IAITO_USE_BUNDLED_RADARE2}")
-message(STATUS "- Python: ${IAITO_ENABLE_PYTHON}")
-message(STATUS "- Python Bindings: ${IAITO_ENABLE_PYTHON_BINDINGS}")
-message(STATUS "- Crash Handling: ${IAITO_ENABLE_CRASH_REPORTS}")
-message(STATUS "- KSyntaxHighlighting: ${KSYNTAXHIGHLIGHTING_STATUS}")
-message(STATUS "- Graphviz: ${IAITO_ENABLE_GRAPHVIZ}")
-message(STATUS "")
-
-
-include(QMakeConfigureFile)
-qmake_configure_file("${CMAKE_CURRENT_SOURCE_DIR}/IaitoConfig.h.in"
-        "${CMAKE_CURRENT_BINARY_DIR}/IaitoConfig.h")
-
-
-if(IAITO_ENABLE_PYTHON_BINDINGS)
-    set(BINDINGS_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/bindings")
-    set(BINDINGS_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/bindings")
-
-    configure_file("${BINDINGS_SRC_DIR}/bindings.xml" "${BINDINGS_BUILD_DIR}/bindings.xml" COPYONLY) # trigger reconfigure if file changes
-
-    execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${BINDINGS_SRC_DIR}/src_list.py" cmake "${BINDINGS_BUILD_DIR}" OUTPUT_VARIABLE BINDINGS_SOURCE)
-
-    set_property(SOURCE ${BINDINGS_SOURCE} PROPERTY SKIP_AUTOGEN ON)
-
-    include_directories("${BINDINGS_BUILD_DIR}/IaitoBindings")
-
-    set(SHIBOKEN_OPTIONS)
-    if (WIN32)
-        list(APPEND SHIBOKEN_OPTIONS --avoid-protected-hack)
-    endif()
-
-    add_custom_command(OUTPUT ${BINDINGS_SOURCE}
-            COMMAND Shiboken2::shiboken2 --project-file="${BINDINGS_BUILD_DIR}/bindings.txt" ${SHIBOKEN_OPTIONS} ${SHIBOKEN_EXTRA_OPTIONS}
-            DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/bindings/bindings.xml" "${BINDINGS_BUILD_DIR}/bindings.txt"
-            IMPLICIT_DEPENDS CXX "${CMAKE_CURRENT_SOURCE_DIR}/bindings/bindings.h"
-            COMMENT "Generating Python bindings with shiboken2")
-else()
-    set(BINDINGS_SOURCE "")
-endif()
-
-
-if (TARGET Graphviz::GVC)
-    list(APPEND SOURCE_FILES ${IAITO_PRO_GRAPHVIZ_SOURCES})
-    list(APPEND HEADER_FILES ${IAITO_PRO_GRAPHVIZ_HEADERS})
-endif()
-
-if (WIN32)
-    set(PLATFORM_RESOURCES "img/iaito.rc")
-else()
-    set(PLATFORM_RESOURCES "")
-endif()
-
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-        OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    add_definitions(-Wall -Wextra)
-    set_source_files_properties(${BINDINGS_SOURCE} PROPERTIES COMPILE_FLAGS -w)
-endif()
-
-
-add_executable(iaito MACOSX_BUNDLE ${UI_FILES} ${QRC_FILES} ${PLATFORM_RESOURCES} ${SOURCE_FILES} ${HEADER_FILES} ${BINDINGS_SOURCE})
-set_target_properties(iaito PROPERTIES
-        ENABLE_EXPORTS ON
-        CXX_VISIBILITY_PRESET hidden
-        MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist")
-target_compile_definitions(iaito PRIVATE IAITO_SOURCE_BUILD)
-
-set(IAITO_INCLUDE_DIRECTORIES core widgets common plugins menus .)
-foreach(_dir ${IAITO_INCLUDE_DIRECTORIES})
-    target_include_directories(iaito PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/${_dir}>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/iaito/${_dir}>
-    )
-endforeach()
-
-if (TARGET Graphviz::GVC)
-    target_link_libraries(iaito PRIVATE Graphviz::GVC)
-    target_compile_definitions(iaito PRIVATE IAITO_ENABLE_GRAPHVIZ)
-endif()
-
-if(IAITO_ENABLE_CRASH_REPORTS)
-    set(THREADS_PREFER_PTHREAD_FLAG ON)
-    find_package(Threads REQUIRED)
-    target_link_libraries(iaito PRIVATE Threads::Threads)
-
-    add_definitions(-DIAITO_ENABLE_CRASH_REPORTS)
-    if (NOT WIN32)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g ")
-    endif()
-    find_package(Breakpad)
-    target_link_libraries(iaito PRIVATE Breakpad::client)
-endif()
-
-target_link_libraries(iaito PUBLIC ${QT_PREFIX}::Core ${QT_PREFIX}::Widgets ${QT_PREFIX}::Gui PRIVATE  ${QT_PREFIX}::Svg ${QT_PREFIX}::Network)
-target_link_libraries(iaito PUBLIC ${RADARE2_TARGET})
-if(IAITO_ENABLE_PYTHON)
-    if (WIN32)
-        # On windows some of the Python STABLE API functions are in seperate library
-        # which isn't added by CMake.
-        get_filename_component(_PYTHON_LIB_DIR ${PYTHON_LIBRARIES} DIRECTORY)
-        target_link_directories(iaito PRIVATE ${_PYTHON_LIB_DIR})
-    endif()
-    target_link_libraries(iaito PRIVATE ${PYTHON_LIBRARIES})
-    if(IAITO_ENABLE_PYTHON_BINDINGS)
-        target_link_libraries(iaito PRIVATE Shiboken2::libshiboken PySide2::pyside2)
-
-        get_target_property(RAW_BINDINGS_INCLUDE_DIRS iaito INCLUDE_DIRECTORIES)
-        set(BINDINGS_INCLUDE_DIRS "")
-        foreach(_dir ${RAW_BINDINGS_INCLUDE_DIRS})
-            string(REGEX REPLACE "\\$<BUILD_INTERFACE:(.*)>" "\\1" _dir ${_dir})
-            string(REGEX REPLACE "\\$<INSTALL_INTERFACE:(.*)>" "" _dir ${_dir})
-            if (NOT "${_dir}" STREQUAL "")
-                list(APPEND BINDINGS_INCLUDE_DIRS "${_dir}")
-            endif()
-        endforeach()
-
-        if(APPLE AND _qt5Core_install_prefix)
-            list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include")
-            list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtCore")
-            list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtGui")
-            list(APPEND BINDINGS_INCLUDE_DIRS "${_qt5Core_install_prefix}/include/QtWidgets")
-        endif()
-        list(APPEND BINDINGS_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS})
-        list(APPEND BINDINGS_INCLUDE_DIRS ${Radare2_INCLUDE_DIRS})
-        list(APPEND BINDINGS_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
-        if (NOT WIN32)
-            string(REPLACE ";" ":" BINDINGS_INCLUDE_DIRS "${BINDINGS_INCLUDE_DIRS}")
-        endif()
-
-        qmake_configure_file("${BINDINGS_SRC_DIR}/bindings.txt.in" "${BINDINGS_BUILD_DIR}/bindings.txt")
-        add_compile_definitions(WIN32_LEAN_AND_MEAN)
-    endif()
-endif()
-
-if(TARGET KF5::SyntaxHighlighting)
-    target_link_libraries(iaito PRIVATE KF5::SyntaxHighlighting)
-    target_compile_definitions(iaito PRIVATE IAITO_ENABLE_KSYNTAXHIGHLIGHTING)
-endif()
-
-if (IAITO_APPIMAGE_BUILD)
-    target_compile_definitions(iaito PRIVATE APPIMAGE)
-endif()
-
-if (IAITO_PACKAGE_R2DEC)
-    target_compile_definitions(iaito PRIVATE IAITO_APPVEYOR_R2DEC)
-endif()
-
-include(Translations)
-
-# Install files
-install(TARGETS iaito
-        EXPORT iaitoTargets
-        RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-        BUNDLE DESTINATION "." # needs to be tested
-        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT Devel
-)
-install(EXPORT iaitoTargets
-    NAMESPACE iaito::
-    DESTINATION ${ConfigPackageLocation}
-    COMPONENT Devel)
-install(FILES
-    cmake/iaitoConfig.cmake
-    DESTINATION ${ConfigPackageLocation}
-    COMPONENT Devel
-)
-foreach(_file ${HEADER_FILES})
-    # Can't use target PUBLIC_HEADER option for installing due to multiple directories
-    get_filename_component(_header_dir "${_file}" DIRECTORY)
-    install (FILES "${_file}" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/iaito/${_header_dir}" COMPONENT Devel)
-endforeach()
-
-if(UNIX AND NOT APPLE)
-    install (FILES "img/iaito-o.svg"
-                DESTINATION "share/icons/hicolor/scalable/apps/")
-    install(FILES "org.radare.iaito.desktop"
-                DESTINATION "share/applications")
-    install(FILES "org.radare.iaito.appdata.xml"
-                DESTINATION "share/metainfo")
-    install(FILES "iaito.1"
-                DESTINATION "share/man/man1")
-endif()
-
-include(Packaging)

src/CorePlugin.cpp

@@ -0,0 +1,35 @@
+#include "common/Radare2Compat.h"
+
+extern int main_iaito();
+static int r_cmd_anal_call(void *user, const char *input)
+{
+    RCore *core = (RCore *) user;
+    if (r_str_startswith(input, "iaito")) {
+        char *n = r_str_newf("%p", user);
+        r_sys_setenv("R2COREPTR", n);
+        free(n);
+        main_iaito();
+        return true;
+    }
+    return false;
+}
+extern "C" {
+// PLUGIN Definition Info
+RCorePlugin r_core_plugin_iaito = {
+    .meta =
+        {
+            .name = (char *)"iaito",
+            .desc = (char *)"Start iaito GUI from the radare2 shell",
+            .license = (char *)"LGPL3",
+        },
+    .call = r_cmd_anal_call,
+};
+
+#ifndef R2_PLUGIN_INCORE
+R_API RLibStruct radare_plugin
+    = {.type = R_LIB_TYPE_CORE,
+       .data = &r_core_plugin_iaito,
+       .version = R2_VERSION,
+       .abiver = R2_ABIVERSION};
+#endif
+}

src/Iaito.pro

@@ -2,77 +2,63 @@ TEMPLATE = app
 
 TARGET = iaito
 
-IAITO_VERSION_MAJOR = 5
-IAITO_VERSION_MINOR = 7
-IAITO_VERSION_PATCH = 0
+IAITO_VERSION_MAJOR = 6
+IAITO_VERSION_MINOR = 2
+IAITO_VERSION_PATCH = 6
+
+CONFIG += c++20
+QMAKE_CXXFLAGS += -std=c++20
+QMAKE_CXXFLAGS += -include $$absolute_path(common/CompilerWorkarounds.h, $$PWD)
+
+CONFIG += app_bundle
+# LIBS+= -dead_strip
 
 CONFIG += sdk_no_version_check
 
-unix:QMAKE_RPATHDIR += /usr/local/lib
-unix:QMAKE_LFLAGS_RPATH=
-unix:QMAKE_LFLAGS += "-Wl,-rpath,/usr/local/lib"
+!defined(IAITO_BUNDLE_R2_APPBUNDLE, var)       IAITO_BUNDLE_R2_APPBUNDLE=false
+equals(IAITO_BUNDLE_R2_APPBUNDLE, true)        CONFIG += IAITO_BUNDLE_R2_APPBUNDLE
+
+unix:!IAITO_BUNDLE_R2_APPBUNDLE {
+    isEmpty(R2_LIBDIR) {
+        R2_LIBDIR = $$system(r2 -H R2_LIBDIR)
+    }
+    QMAKE_RPATHDIR += $${R2_LIBDIR}
+    QMAKE_LFLAGS_RPATH=
+    QMAKE_LFLAGS += "-Wl,-rpath,$${R2_LIBDIR}"
+}
+
+QMAKE_CXXFLAGS += $$(CXXFLAGS)
+QMAKE_CFLAGS += $$(CFLAGS)
+QMAKE_LFLAGS += $$(LDFLAGS)
 
 # build with thread-sanitizer
 # unix:QMAKE_LFLAGS += "-fsanitize=thread"
 # QMAKE_CXXFLAGS += -fsanitize=thread
-QMAKE_CXXFLAGS += -g
-
+QMAKE_CXXFLAGS += -g -O0
+#QMAKE_CXXFLAGS += -O0 -fsanitize=address
+#QMAKE_LFLAGS += -fsanitize=address
 
 VERSION = $${IAITO_VERSION_MAJOR}.$${IAITO_VERSION_MINOR}.$${IAITO_VERSION_PATCH}
 
 # Required QT version
-lessThan(QT_MAJOR_VERSION, 5): error("requires Qt 5")
-# Doesnt build for Qt6 yet... but will do soon
-
-TRANSLATIONS += translations/ar/iaito_ar.ts \
-                translations/ca/iaito_ca.ts \
-                translations/de/iaito_de.ts \
-                translations/es-ES/iaito_es.ts \
-                translations/eo/iaito_eo.ts \
-                translations/eu/iaito_eu.ts \
-                translations/fa/iaito_fa.ts \
-                translations/gl/iaito_gl.ts \
-                translations/fr/iaito_fr.ts \
-                translations/he/iaito_he.ts \
-                translations/hi/iaito_hi.ts \
-                translations/it/iaito_it.ts \
-                translations/ja/iaito_ja.ts \
-                translations/nl/iaito_nl.ts \
-                translations/pt-PT/iaito_pt.ts \
-                translations/ro/iaito_ro.ts \
-                translations/ru/iaito_ru.ts \
-                translations/tr/iaito_tr.ts \
-                translations/tp/iaito_tp.ts \
-                translations/zh-CN/iaito_zh.ts
-
-# translations/ko/iaito_ko.ts problems with fonts
-# translations/pt-BR/iaito_pt.ts #2321 handling multiple versions of a language
+lessThan(QT_MAJOR_VERSION, 5): error("requires at least Qt 5")
 
 # Icon for OS X
-ICON = img/iaito-o.icns
+ICON = img/iaito.icns
 
 # Icon/resources for Windows
-win32: RC_ICONS = img/iaito-o.ico
+win32: RC_ICONS = img/iaito.ico
 
-QT += core gui widgets svg network
+QT += widgets svg network
 QT_CONFIG -= no-pkg-config
 
+greaterThan(QT_MAJOR_VERSION, 5): QT += svgwidgets
 
 !defined(IAITO_ENABLE_CRASH_REPORTS, var)      IAITO_ENABLE_CRASH_REPORTS=false
 equals(IAITO_ENABLE_CRASH_REPORTS, true)       CONFIG += IAITO_ENABLE_CRASH_REPORTS
 
-!defined(IAITO_ENABLE_PYTHON, var)             IAITO_ENABLE_PYTHON=false
-equals(IAITO_ENABLE_PYTHON, true)              CONFIG += IAITO_ENABLE_PYTHON
-
-!defined(IAITO_ENABLE_PYTHON_BINDINGS, var)    IAITO_ENABLE_PYTHON_BINDINGS=false
-equals(IAITO_ENABLE_PYTHON, true) {
-    equals(IAITO_ENABLE_PYTHON_BINDINGS, true) {
-        CONFIG += IAITO_ENABLE_PYTHON_BINDINGS
-    }
-}
-
-!defined(IAITO_BUNDLE_R2_APPBUNDLE, var)       IAITO_BUNDLE_R2_APPBUNDLE=false
-equals(IAITO_BUNDLE_R2_APPBUNDLE, true)        CONFIG += IAITO_BUNDLE_R2_APPBUNDLE
+!defined(IAITO_ENABLE_DEBUGGER, var)           IAITO_ENABLE_DEBUGGER=true
+equals(IAITO_ENABLE_DEBUGGER, true)            CONFIG += IAITO_ENABLE_DEBUGGER
 
 !defined(IAITO_APPVEYOR_R2DEC, var)            IAITO_APPVEYOR_R2DEC=false
 equals(IAITO_APPVEYOR_R2DEC, true)             CONFIG += IAITO_APPVEYOR_R2DEC
@@ -86,57 +72,40 @@ IAITO_ENABLE_CRASH_REPORTS {
     message("Crash report support enabled.")
     DEFINES += IAITO_ENABLE_CRASH_REPORTS
 } else {
-    message("Crash report support disabled.")
+    # message("Crash report support disabled.")
 }
 
-IAITO_ENABLE_PYTHON {
-    message("Python enabled.")
-    DEFINES += IAITO_ENABLE_PYTHON
+IAITO_ENABLE_DEBUGGER {
+    message("Native debugger support enabled.")
+    DEFINES += IAITO_ENABLE_DEBUGGER
 } else {
-    message("Python disabled.")
-}
-
-IAITO_ENABLE_PYTHON_BINDINGS {
-    message("Python Bindings enabled.")
-    DEFINES += IAITO_ENABLE_PYTHON_BINDINGS
-} else {
-    message("Python Bindings disabled. (requires IAITO_ENABLE_PYTHON=true)")
-}
-
-win32:defined(IAITO_DEPS_DIR, var) {
-    !defined(SHIBOKEN_EXECUTABLE, var)          SHIBOKEN_EXECUTABLE="$${IAITO_DEPS_DIR}/pyside/bin/shiboken2.exe"
-    !defined(SHIBOKEN_INCLUDEDIR, var)          SHIBOKEN_INCLUDEDIR="$${IAITO_DEPS_DIR}/pyside/include/shiboken2"
-    !defined(SHIBOKEN_LIBRARY, var)             SHIBOKEN_LIBRARY="$${IAITO_DEPS_DIR}/pyside/lib/shiboken2.abi3.lib"
-    !defined(PYSIDE_INCLUDEDIR, var)            PYSIDE_INCLUDEDIR="$${IAITO_DEPS_DIR}/pyside/include/PySide2"
-    !defined(PYSIDE_LIBRARY, var)               PYSIDE_LIBRARY="$${IAITO_DEPS_DIR}/pyside/lib/pyside2.abi3.lib"
-    !defined(PYSIDE_TYPESYSTEMS, var)           PYSIDE_TYPESYSTEMS="$${IAITO_DEPS_DIR}/pyside/share/PySide2/typesystems"
+    message("Native debugger support disabled.")
 }
 
 INCLUDEPATH *= . core widgets dialogs common plugins menus
 
 win32 {
     # Generate debug symbols in release mode
-    QMAKE_CXXFLAGS_RELEASE += -Zi   # Compiler
-    QMAKE_LFLAGS_RELEASE += /DEBUG  # Linker
+# QMAKE_CXXFLAGS_RELEASE += -Zi   # Compiler
+# QMAKE_LFLAGS_RELEASE += /DEBUG  # Linker
 
     # Multithreaded compilation
     QMAKE_CXXFLAGS += -MP
 }
 
 macx {
-    QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -std=c++17 -stdlib=libc++ -g
+    QMAKE_CXXFLAGS += -mmacosx-version-min=10.7 -std=c++20 -stdlib=libc++ -g
     QMAKE_TARGET_BUNDLE_PREFIX = org.radare
     QMAKE_BUNDLE = iaito
     QMAKE_INFO_PLIST = macos/Info.plist
 }
 
-unix:exists(/usr/local/include/libr)|bsd:exists(/usr/local/include/libr) {
-    INCLUDEPATH += /usr/local/include/libr
-    INCLUDEPATH += /usr/local/include/libr/sdb
-}
-unix:exists(/usr/include/libr) {
-    INCLUDEPATH += /usr/include/libr
-    INCLUDEPATH += /usr/include/libr/sdb
+unix {
+    isEmpty(R2_INCDIR) {
+        R2_INCDIR = $$system(r2 -H R2_INCDIR)
+    }
+    INCLUDEPATH += $${R2_INCDIR}
+    INCLUDEPATH += $${R2_INCDIR}/sdb
 }
 unix {
     QMAKE_LFLAGS += -rdynamic # Export dynamic symbols for plugins
@@ -149,132 +118,6 @@ include(lib_radare2.pri)
     CONFIG += link_pkgconfig
 }
 
-IAITO_ENABLE_PYTHON {
-    win32 {
-        PYTHON_EXECUTABLE = $$system("where python", lines)
-        PYTHON_EXECUTABLE = $$first(PYTHON_EXECUTABLE)
-        pythonpath = $$clean_path($$dirname(PYTHON_EXECUTABLE))
-        LIBS += -L$${pythonpath}/libs -lpython3
-        INCLUDEPATH += $${pythonpath}/include
-    }
-
-    unix|macx|bsd {
-        defined(PYTHON_FRAMEWORK_DIR, var) {
-            message("Using Python.framework at $$PYTHON_FRAMEWORK_DIR")
-            INCLUDEPATH += $$PYTHON_FRAMEWORK_DIR/Python.framework/Headers
-            LIBS += -F$$PYTHON_FRAMEWORK_DIR -framework Python
-            DEFINES += MACOS_PYTHON_FRAMEWORK_BUNDLED
-        } else {
-            !packagesExist(python3) {
-                error("ERROR: Python 3 could not be found. Make sure it is available to pkg-config.")
-            }
-            PKGCONFIG += python3
-        }
-    }
-
-    IAITO_ENABLE_PYTHON_BINDINGS {
-        isEmpty(SHIBOKEN_EXECUTABLE):!packagesExist(shiboken2) {
-            error("ERROR: Shiboken2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
-        }
-        isEmpty(PYSIDE_LIBRARY):!packagesExist(pyside2) {
-            error("ERROR: PySide2, which is required to build the Python Bindings, could not be found. Make sure it is available to pkg-config.")
-        }
-        win32 {
-            BINDINGS_SRC_LIST_CMD = "\"$${PYTHON_EXECUTABLE}\" bindings/src_list.py"
-        } else {
-            BINDINGS_SRC_LIST_CMD = "python3 bindings/src_list.py"
-        }
-        BINDINGS_SRC_DIR = "$${PWD}/bindings"
-        BINDINGS_BUILD_DIR = "$${OUT_PWD}/bindings"
-        BINDINGS_SOURCE_DIR = "$${BINDINGS_BUILD_DIR}/IaitoBindings"
-        BINDINGS_SOURCE = $$system("$${BINDINGS_SRC_LIST_CMD} qmake \"$${BINDINGS_BUILD_DIR}\"")
-        BINDINGS_INCLUDE_DIRS = "$$[QT_INSTALL_HEADERS]" \
-                                "$$[QT_INSTALL_HEADERS]/QtCore" \
-                                "$$[QT_INSTALL_HEADERS]/QtWidgets" \
-                                "$$[QT_INSTALL_HEADERS]/QtGui"
-        for (path, R2_INCLUDEPATH) {
-           BINDINGS_INCLUDE_DIRS += "$$path"
-        }
-        for(path, INCLUDEPATH) {
-            BINDINGS_INCLUDE_DIRS += $$absolute_path("$$path")
-        }
-
-        win32 {
-            PATH_SEP = ";"
-        } else {
-            PATH_SEP = ":"
-        }
-        BINDINGS_INCLUDE_DIRS = $$join(BINDINGS_INCLUDE_DIRS, $$PATH_SEP)
-
-        isEmpty(SHIBOKEN_EXECUTABLE) {
-            SHIBOKEN_EXECUTABLE = $$system("pkg-config --variable=generator_location shiboken2")
-        }
-
-        isEmpty(PYSIDE_TYPESYSTEMS) {
-            PYSIDE_TYPESYSTEMS = $$system("pkg-config --variable=typesystemdir pyside2")
-        }
-        isEmpty(PYSIDE_INCLUDEDIR) {
-            PYSIDE_INCLUDEDIR = $$system("pkg-config --variable=includedir pyside2")
-        }
-
-        QMAKE_SUBSTITUTES += bindings/bindings.txt.in
-
-        SHIBOKEN_OPTIONS = --project-file="$${BINDINGS_BUILD_DIR}/bindings.txt"
-        defined(SHIBOKEN_EXTRA_OPTIONS, var) SHIBOKEN_OPTIONS += $${SHIBOKEN_EXTRA_OPTIONS}
-
-        win32:SHIBOKEN_OPTIONS += --avoid-protected-hack
-        bindings.target = bindings_target
-        bindings.commands = $$quote($$system_path($${SHIBOKEN_EXECUTABLE})) $${SHIBOKEN_OPTIONS}
-        QMAKE_EXTRA_TARGETS += bindings
-        PRE_TARGETDEPS += bindings_target
-        # GENERATED_SOURCES += $${BINDINGS_SOURCE} done by dummy targets bellow
-
-        INCLUDEPATH += "$${BINDINGS_SOURCE_DIR}"
-
-        win32:DEFINES += WIN32_LEAN_AND_MEAN
-
-        !isEmpty(PYSIDE_LIBRARY) {
-            LIBS += "$$SHIBOKEN_LIBRARY" "$$PYSIDE_LIBRARY"
-            INCLUDEPATH += "$$SHIBOKEN_INCLUDEDIR"
-        } else:macx {
-            # Hack needed because with regular PKGCONFIG qmake will mess up everything
-            QMAKE_CXXFLAGS += $$system("pkg-config --cflags shiboken2 pyside2")
-            LIBS += $$system("pkg-config --libs shiboken2 pyside2")
-        } else {
-            PKGCONFIG += shiboken2 pyside2
-        }
-        INCLUDEPATH += "$$PYSIDE_INCLUDEDIR" "$$PYSIDE_INCLUDEDIR/QtCore" "$$PYSIDE_INCLUDEDIR/QtWidgets" "$$PYSIDE_INCLUDEDIR/QtGui"
-
-
-        BINDINGS_DUMMY_INPUT_LIST = bindings/src_list.py
-
-        # dummy rules to specify dependency between generated binding files and bindings_target
-        bindings_h.input = BINDINGS_DUMMY_INPUT_LIST
-        bindings_h.depends = bindings_target
-        bindings_h.output = iaitobindings_python.h
-        bindings_h.commands = "echo placeholder command ${QMAKE_FILE_OUT}"
-        bindings_h.variable_out = HEADERS
-        QMAKE_EXTRA_COMPILERS += bindings_h
-
-        for(path, BINDINGS_SOURCE) {
-            dummy_input = $$replace(path, .cpp, .txt)
-            BINDINGS_DUMMY_INPUTS += $$dummy_input
-            win32 {
-                _ = $$system("mkdir \"$$dirname(dummy_input)\"; echo a >\"$$dummy_input\"")
-            } else {
-                _ = $$system("mkdir -p \"$$dirname(dummy_input)\"; echo a >\"$$dummy_input\"")
-            }
-        }
-
-        bindings_cpp.input = BINDINGS_DUMMY_INPUTS
-        bindings_cpp.depends = bindings_target
-        bindings_cpp.output = "$${BINDINGS_SOURCE_DIR}/${QMAKE_FILE_IN_BASE}.cpp"
-        bindings_cpp.commands = "echo placeholder command ${QMAKE_FILE_OUT}"
-        bindings_cpp.variable_out = GENERATED_SOURCES
-        QMAKE_EXTRA_COMPILERS += bindings_cpp
-    }
-}
-
 IAITO_ENABLE_CRASH_REPORTS {
     defined(BREAKPAD_FRAMEWORK_DIR, var)|defined(BREAKPAD_SOURCE_DIR, var) {
         defined(BREAKPAD_FRAMEWORK_DIR, var) {
@@ -311,9 +154,9 @@ IAITO_APPVEYOR_R2DEC {
 IAITO_R2GHIDRA_STATIC {
     message("Building with static r2ghidra support")
     DEFINES += IAITO_R2GHIDRA_STATIC
-    SOURCES += $$R2GHIDRA_SOURCE/cutter-plugin/R2GhidraDecompiler.cpp
-    HEADERS += $$R2GHIDRA_SOURCE/cutter-plugin/R2GhidraDecompiler.h
-    INCLUDEPATH += $$R2GHIDRA_SOURCE/cutter-plugin
+    SOURCES += $$R2GHIDRA_SOURCE/iaito-plugin/R2GhidraDecompiler.cpp
+    HEADERS += $$R2GHIDRA_SOURCE/iaito-plugin/R2GhidraDecompiler.h
+    INCLUDEPATH += $$R2GHIDRA_SOURCE/iaito-plugin
     LIBS += -L$$R2GHIDRA_INSTALL_PATH -lcore_ghidra -ldelayimp
     QMAKE_LFLAGS += /delayload:core_ghidra.dll
 }
@@ -321,15 +164,20 @@ IAITO_R2GHIDRA_STATIC {
 QMAKE_SUBSTITUTES += IaitoConfig.h.in
 
 SOURCES += \
+    common/ExceptionInfo.cpp \
+    widgets/ExceptionBar.cpp \
     Main.cpp \
     core/Iaito.cpp \
     dialogs/EditStringDialog.cpp \
+    dialogs/DumpDialog.cpp \
     dialogs/WriteCommandsDialogs.cpp \
     widgets/DisassemblerGraphView.cpp \
     widgets/OverviewView.cpp \
+    common/PreviewTooltip.cpp \
     common/RichTextPainter.cpp \
     dialogs/InitialOptionsDialog.cpp \
     dialogs/AboutDialog.cpp \
+    dialogs/AddressSpaceManagerDialog.cpp \
     dialogs/CommentsDialog.cpp \
     dialogs/EditInstructionDialog.cpp \
     dialogs/FlagDialog.cpp \
@@ -337,57 +185,81 @@ SOURCES += \
     dialogs/NativeDebugDialog.cpp \
     dialogs/XrefsDialog.cpp \
     core/MainWindow.cpp \
+    core/DockManager.cpp \
+    core/QtDockBackend.cpp \
     common/Helpers.cpp \
+    common/TextEditDialog.cpp \
     common/Highlighter.cpp \
     common/MdHighlighter.cpp \
+    common/Markdown.cpp \
     common/DirectionalComboBox.cpp \
-    dialogs/preferences/AsmOptionsWidget.cpp \
-    dialogs/NewFileDialog.cpp \
+    common/TypeScriptHighlighter.cpp \
     common/AnalTask.cpp \
+    dialogs/settings/AsmOptionsWidget.cpp \
+    dialogs/FortuneDialog.cpp \
+    dialogs/NewFileDialog.cpp \
     widgets/CommentsWidget.cpp \
     widgets/ConsoleWidget.cpp \
+    widgets/CustomCommandWidget.cpp \
     widgets/Dashboard.cpp \
     widgets/EntrypointWidget.cpp \
     widgets/ExportsWidget.cpp \
     widgets/FlagsWidget.cpp \
     widgets/FunctionsWidget.cpp \
+    widgets/GlobalVariablesWidget.cpp \
     widgets/ImportsWidget.cpp \
+    widgets/CodeEditor.cpp \
     widgets/Omnibar.cpp \
     widgets/RelocsWidget.cpp \
     widgets/SectionsWidget.cpp \
     widgets/SegmentsWidget.cpp \
     widgets/StringsWidget.cpp \
     widgets/SymbolsWidget.cpp \
+    widgets/XrefsWidget.cpp \
+    widgets/RefsWidget.cpp \
+    widgets/CodeInfoWidget.cpp \
     menus/DisassemblyContextMenu.cpp \
     menus/DecompilerContextMenu.cpp \
+    menus/ColorPickerMenu.cpp \
+    menus/PinPickerMenu.cpp \
     widgets/DisassemblyWidget.cpp \
     widgets/HexdumpWidget.cpp \
     common/Configuration.cpp \
+    common/theme/Theme.cpp \
+    common/theme/IaitoStyle.cpp \
     common/Colors.cpp \
     dialogs/SaveProjectDialog.cpp \
     common/TempConfig.cpp \
     common/SvgIconEngine.cpp \
     common/SyntaxHighlighter.cpp \
     widgets/DecompilerWidget.cpp \
+    widgets/DecompilerTextEdit.cpp \
     widgets/VisualNavbar.cpp \
     widgets/GraphView.cpp \
-    dialogs/preferences/PreferencesDialog.cpp \
-    dialogs/preferences/AppearanceOptionsWidget.cpp \
-    dialogs/preferences/GraphOptionsWidget.cpp \
-    dialogs/preferences/PreferenceCategory.cpp \
-    dialogs/preferences/InitializationFileEditor.cpp \
+    dialogs/settings/SettingsDialog.cpp \
+    dialogs/settings/AppearanceOptionsWidget.cpp \
+    dialogs/settings/GraphOptionsWidget.cpp \
+    dialogs/settings/SettingCategory.cpp \
+    dialogs/settings/InitializationFileEditor.cpp \
     widgets/QuickFilterView.cpp \
     widgets/ClassesWidget.cpp \
     widgets/ResourcesWidget.cpp \
     widgets/VTablesWidget.cpp \
     widgets/TypesWidget.cpp \
     widgets/HeadersWidget.cpp \
+    widgets/InterfacesWidget.cpp \
     widgets/SearchWidget.cpp \
     IaitoApplication.cpp \
-    common/PythonAPI.cpp \
+    common/DeepLink.cpp \
+    common/SamplesDB.cpp \
     dialogs/R2PluginsDialog.cpp \
     widgets/IaitoDockWidget.cpp \
     widgets/IaitoTreeWidget.cpp \
+    widgets/MapsWidget.cpp \
+    widgets/BinariesWidget.cpp \
+    widgets/FilesWidget.cpp \
+    widgets/FilesystemWidget.cpp \
+    common/SourceLineReference.cpp \
     widgets/GraphWidget.cpp \
     widgets/OverviewWidget.cpp \
     common/JsonTreeItem.cpp \
@@ -395,6 +267,7 @@ SOURCES += \
     dialogs/VersionInfoDialog.cpp \
     widgets/ZignaturesWidget.cpp \
     common/AsyncTask.cpp \
+    common/DecompileTask.cpp \
     dialogs/AsyncTaskDialog.cpp \
     widgets/StackWidget.cpp \
     widgets/RegistersWidget.cpp \
@@ -408,8 +281,10 @@ SOURCES += \
     dialogs/R2TaskDialog.cpp \
     widgets/DebugActions.cpp \
     widgets/MemoryMapWidget.cpp \
-    dialogs/preferences/DebugOptionsWidget.cpp \
-    dialogs/preferences/PluginsOptionsWidget.cpp \
+    dialogs/settings/DebugOptionsWidget.cpp \
+    dialogs/settings/WebserverOptionsWidget.cpp \
+    dialogs/settings/SamplesOptionsWidget.cpp \
+    dialogs/settings/PluginsOptionsWidget.cpp \
     widgets/BreakpointWidget.cpp \
     dialogs/BreakpointsDialog.cpp \
     dialogs/AttachProcDialog.cpp \
@@ -417,10 +292,10 @@ SOURCES += \
     dialogs/SetToDataDialog.cpp \
     dialogs/EditVariablesDialog.cpp \
     dialogs/EditFunctionDialog.cpp \
+    dialogs/SwitchJumpTableDialog.cpp \
     widgets/IaitoTreeView.cpp \
     widgets/ComboQuickFilterView.cpp \
     dialogs/HexdumpRangeDialog.cpp \
-    common/QtResImporter.cpp \
     common/IaitoSeekable.cpp \
     common/RefreshDeferrer.cpp \
     dialogs/WelcomeDialog.cpp \
@@ -428,7 +303,6 @@ SOURCES += \
     dialogs/EditMethodDialog.cpp \
     dialogs/TypesInteractionDialog.cpp \
     widgets/SdbWidget.cpp \
-    common/PythonManager.cpp \
     plugins/PluginManager.cpp \
     common/BasicBlockHighlighter.cpp \
     common/BasicInstructionHighlighter.cpp \
@@ -437,26 +311,40 @@ SOURCES += \
     common/ColorThemeWorker.cpp \
     widgets/ColorThemeComboBox.cpp \
     widgets/ColorThemeListView.cpp \
-    dialogs/preferences/ColorThemeEditDialog.cpp \
-    common/UpdateWorker.cpp \
+    dialogs/settings/ColorThemeEditDialog.cpp \
+    dialogs/settings/InterfaceThemeEditDialog.cpp \
     widgets/MemoryDockWidget.cpp \
     common/CrashHandler.cpp \
     common/BugReporting.cpp \
     common/HighDpiPixmap.cpp \
     widgets/GraphGridLayout.cpp \
     widgets/HexWidget.cpp \
+    widgets/HexPatWidget.cpp \
+    widgets/AddressScrollBar.cpp \
+    widgets/R2AIWidget.cpp \
+    widgets/R2McpWidget.cpp \
     common/SelectionHighlight.cpp \
     common/Decompiler.cpp \
     common/R2GhidraCmdDecompiler.cpp \
+    common/R2JadxDecompiler.cpp \
+    common/ShortcutKeys.cpp \
+    common/ShortcutManager.cpp \
+    dialogs/ShortcutKeysDialog.cpp \
+    common/R2SourceDecompiler.cpp \
     common/R2pdcCmdDecompiler.cpp \
+    common/R2DecaiDecompiler.cpp \
+    common/R2AiDecompiler.cpp \
+    common/R2AnotesDecompiler.cpp \
+    common/R2HermesDecompiler.cpp \
     common/R2retdecDecompiler.cpp \
     menus/AddressableItemContextMenu.cpp \
     common/AddressableItemModel.cpp \
+    common/NameListModel.cpp \
+    widgets/NameListView.cpp \
     widgets/ListDockWidget.cpp \
     dialogs/MultitypeFileSaveDialog.cpp \
     widgets/BoolToggleDelegate.cpp \
     common/IOModesController.cpp \
-    common/SettingsUpgrade.cpp \
     dialogs/LayoutManager.cpp \
     common/IaitoLayout.cpp \
     widgets/GraphHorizontalAdapter.cpp \
@@ -465,83 +353,130 @@ SOURCES += \
     widgets/SimpleTextGraphView.cpp \
     widgets/R2GraphWidget.cpp \
     widgets/CallGraph.cpp \
+    widgets/CalculatorWidget.cpp \
+    widgets/SyscallsWidget.cpp \
     widgets/AddressableDockWidget.cpp \
-    dialogs/preferences/AnalOptionsWidget.cpp \
-    common/DecompilerHighlighter.cpp
+    dialogs/settings/AnalOptionsWidget.cpp \
+    dialogs/settings/ShortcutsOptionsWidget.cpp \
+    common/DecompilerHighlighter.cpp \
+    dialogs/PackageManagerDialog.cpp \
+    dialogs/AssemblerDialog.cpp \
+    dialogs/ScriptManagerDialog.cpp \
+    dialogs/ScriptManagerWidget.cpp \
+    widgets/ZoomWidget.cpp \
+    common/DataAnalysis.cpp \
+    common/TypeLayout.cpp \
+    widgets/DataAnalysisView.cpp \
+    widgets/DataAnalysisWidget.cpp
 
 GRAPHVIZ_SOURCES = \
     widgets/GraphvizLayout.cpp
 
 HEADERS  += \
+    common/ExceptionInfo.h \
+    widgets/ExceptionBar.h \
+    common/R2Shims.h \
     core/Iaito.h \
     core/IaitoCommon.h \
     core/IaitoDescriptions.h \
     dialogs/EditStringDialog.h \
+    dialogs/DumpDialog.h \
     dialogs/WriteCommandsDialogs.h \
+    widgets/ClickableSvgWidget.h \
     widgets/DisassemblerGraphView.h \
     widgets/OverviewView.h \
+    common/PreviewTooltip.h \
     common/RichTextPainter.h \
     common/CachedFontMetrics.h \
+    common/TypeScriptHighlighter.h \
+    common/Helpers.h \
+    common/ShortcutKeys.h \
+    common/ShortcutManager.h \
+    dialogs/ShortcutKeysDialog.h \
+    common/TextEditDialog.h \
+    common/Highlighter.h \
+    common/MdHighlighter.h \
+    common/Markdown.h \
+    common/DirectionalComboBox.h \
+    common/AnalTask.h \
     dialogs/AboutDialog.h \
-    dialogs/preferences/AsmOptionsWidget.h \
+    dialogs/AddressSpaceManagerDialog.h \
+    dialogs/settings/AsmOptionsWidget.h \
     dialogs/CommentsDialog.h \
     dialogs/EditInstructionDialog.h \
     dialogs/FlagDialog.h \
     dialogs/RemoteDebugDialog.h \
     dialogs/NativeDebugDialog.h \
     dialogs/XrefsDialog.h \
-    common/Helpers.h \
     core/MainWindow.h \
-    common/Highlighter.h \
-    common/MdHighlighter.h \
-    common/DirectionalComboBox.h \
+    core/DockManager.h \
+    core/DockBackend.h \
+    core/QtDockBackend.h \
     dialogs/InitialOptionsDialog.h \
     dialogs/NewFileDialog.h \
-    common/AnalTask.h \
     widgets/CommentsWidget.h \
     widgets/ConsoleWidget.h \
+    widgets/CustomCommandWidget.h \
     widgets/Dashboard.h \
     widgets/EntrypointWidget.h \
     widgets/ExportsWidget.h \
     widgets/FlagsWidget.h \
     widgets/FunctionsWidget.h \
+    widgets/GlobalVariablesWidget.h \
     widgets/ImportsWidget.h \
     widgets/Omnibar.h \
     widgets/RelocsWidget.h \
+    widgets/CodeEditor.h \
     widgets/SectionsWidget.h \
     widgets/SegmentsWidget.h \
     widgets/StringsWidget.h \
     widgets/SymbolsWidget.h \
+    widgets/XrefsWidget.h \
+    widgets/RefsWidget.h \
+    widgets/CodeInfoWidget.h \
     menus/DisassemblyContextMenu.h \
     menus/DecompilerContextMenu.h \
+    menus/ContextMenuIcons.h \
+    menus/ColorPickerMenu.h \
+    menus/PinPickerMenu.h \
     widgets/DisassemblyWidget.h \
     widgets/HexdumpWidget.h \
     common/Configuration.h \
+    common/theme/Theme.h \
+    common/theme/IaitoStyle.h \
     common/Colors.h \
     dialogs/SaveProjectDialog.h \
     common/TempConfig.h \
     common/SvgIconEngine.h \
     common/SyntaxHighlighter.h \
     widgets/DecompilerWidget.h \
+    widgets/DecompilerTextEdit.h \
     widgets/VisualNavbar.h \
     widgets/GraphView.h \
-    dialogs/preferences/PreferencesDialog.h \
-    dialogs/preferences/AppearanceOptionsWidget.h \
-    dialogs/preferences/PreferenceCategory.h \
-    dialogs/preferences/GraphOptionsWidget.h \
-    dialogs/preferences/InitializationFileEditor.h \
+    dialogs/settings/SettingsDialog.h \
+    dialogs/settings/AppearanceOptionsWidget.h \
+    dialogs/settings/SettingCategory.h \
+    dialogs/settings/GraphOptionsWidget.h \
+    dialogs/settings/InitializationFileEditor.h \
     widgets/QuickFilterView.h \
     widgets/ClassesWidget.h \
     widgets/ResourcesWidget.h \
     IaitoApplication.h \
+    common/DeepLink.h \
+    common/SamplesDB.h \
     widgets/VTablesWidget.h \
     widgets/TypesWidget.h \
     widgets/HeadersWidget.h \
+    widgets/InterfacesWidget.h \
     widgets/SearchWidget.h \
-    common/PythonAPI.h \
     dialogs/R2PluginsDialog.h \
     widgets/IaitoDockWidget.h \
     widgets/IaitoTreeWidget.h \
+    widgets/MapsWidget.h \
+    widgets/BinariesWidget.h \
+    widgets/FilesWidget.h \
+    widgets/FilesystemWidget.h \
+    common/SourceLineReference.h \
     widgets/GraphWidget.h \
     widgets/OverviewWidget.h \
     common/JsonTreeItem.h \
@@ -549,12 +484,14 @@ HEADERS  += \
     dialogs/VersionInfoDialog.h \
     widgets/ZignaturesWidget.h \
     common/AsyncTask.h \
+    common/DecompileTask.h \
     dialogs/AsyncTaskDialog.h \
     widgets/StackWidget.h \
     widgets/RegistersWidget.h \
     widgets/ThreadsWidget.h \
     widgets/ProcessesWidget.h \
     widgets/BacktraceWidget.h \
+    dialogs/FortuneDialog.h \
     dialogs/MapFileDialog.h \
     common/StringsTask.h \
     common/FunctionsTask.h \
@@ -565,8 +502,10 @@ HEADERS  += \
     dialogs/R2TaskDialog.h \
     widgets/DebugActions.h \
     widgets/MemoryMapWidget.h \
-    dialogs/preferences/DebugOptionsWidget.h \
-    dialogs/preferences/PluginsOptionsWidget.h \
+    dialogs/settings/DebugOptionsWidget.h \
+    dialogs/settings/WebserverOptionsWidget.h \
+    dialogs/settings/SamplesOptionsWidget.h \
+    dialogs/settings/PluginsOptionsWidget.h \
     widgets/BreakpointWidget.h \
     dialogs/BreakpointsDialog.h \
     dialogs/AttachProcDialog.h \
@@ -575,10 +514,10 @@ HEADERS  += \
     common/InitialOptions.h \
     dialogs/EditVariablesDialog.h \
     dialogs/EditFunctionDialog.h \
+    dialogs/SwitchJumpTableDialog.h \
     widgets/IaitoTreeView.h \
     widgets/ComboQuickFilterView.h \
     dialogs/HexdumpRangeDialog.h \
-    common/QtResImporter.h \
     common/IaitoSeekable.h \
     common/RefreshDeferrer.h \
     dialogs/WelcomeDialog.h \
@@ -588,36 +527,48 @@ HEADERS  += \
     common/CrashHandler.h \
     dialogs/TypesInteractionDialog.h \
     widgets/SdbWidget.h \
-    common/PythonManager.h \
     plugins/PluginManager.h \
     common/BasicBlockHighlighter.h \
     common/BasicInstructionHighlighter.h \
-    common/UpdateWorker.h \
     widgets/ColorPicker.h \
     common/ColorThemeWorker.h \
     widgets/ColorThemeComboBox.h \
     widgets/MemoryDockWidget.h \
     widgets/ColorThemeListView.h \
-    dialogs/preferences/ColorThemeEditDialog.h \
+    dialogs/settings/ColorThemeEditDialog.h \
+    dialogs/settings/InterfaceThemeEditDialog.h \
+    dialogs/settings/ShortcutsOptionsWidget.h \
     dialogs/LinkTypeDialog.h \
     common/BugReporting.h \
     common/HighDpiPixmap.h \
     widgets/GraphLayout.h \
     widgets/GraphGridLayout.h \
     widgets/HexWidget.h \
+    widgets/HexPatWidget.h \
+    common/SparseHexLayout.h \
+    widgets/AddressScrollBar.h \
+    widgets/R2AIWidget.h \
+    widgets/R2McpWidget.h \
     common/SelectionHighlight.h \
     common/Decompiler.h \
     common/R2GhidraCmdDecompiler.h \
+    common/R2JadxDecompiler.h \
+    common/R2DecaiDecompiler.h \
+    common/R2AiDecompiler.h \
+    common/R2AnotesDecompiler.h \
+    common/R2HermesDecompiler.h \
     common/R2pdcCmdDecompiler.h \
+    common/R2SourceDecompiler.h \
     common/R2retdecDecompiler.h \
     menus/AddressableItemContextMenu.h \
     common/AddressableItemModel.h \
+    common/NameListModel.h \
+    widgets/NameListView.h \
     widgets/ListDockWidget.h \
     widgets/AddressableItemList.h \
     dialogs/MultitypeFileSaveDialog.h \
     widgets/BoolToggleDelegate.h \
     common/IOModesController.h \
-    common/SettingsUpgrade.h \
     dialogs/LayoutManager.h \
     common/IaitoLayout.h \
     common/BinaryTrees.h \
@@ -628,26 +579,41 @@ HEADERS  += \
     widgets/SimpleTextGraphView.h \
     widgets/R2GraphWidget.h \
     widgets/CallGraph.h \
+    widgets/CalculatorWidget.h \
+    widgets/SyscallsWidget.h \
     widgets/AddressableDockWidget.h \
-    dialogs/preferences/AnalOptionsWidget.h \
-    common/DecompilerHighlighter.h
+    dialogs/settings/AnalOptionsWidget.h \
+    common/DecompilerHighlighter.h \
+    common/CodeMetaRange.h \
+    dialogs/PackageManagerDialog.h \
+    dialogs/AssemblerDialog.h \
+    dialogs/ScriptManagerDialog.h \
+    dialogs/ScriptManagerWidget.h \
+    widgets/ZoomWidget.h \
+    common/DataAnalysis.h \
+    common/TypeLayout.h \
+    widgets/DataAnalysisView.h \
+    widgets/DataAnalysisWidget.h
 
 GRAPHVIZ_HEADERS = widgets/GraphvizLayout.h
 
 FORMS    += \
+    widgets/GlobalVariablesWidget.ui \
+    widgets/DataAnalysisWidget.ui \
     dialogs/AboutDialog.ui \
     dialogs/EditStringDialog.ui \
     dialogs/Base64EnDecodedWriteDialog.ui \
+    dialogs/DumpDialog.ui \
     dialogs/DuplicateFromOffsetDialog.ui \
     dialogs/IncrementDecrementDialog.ui \
-    dialogs/preferences/AsmOptionsWidget.ui \
+    dialogs/settings/AsmOptionsWidget.ui \
     dialogs/CommentsDialog.ui \
     dialogs/EditInstructionDialog.ui \
     dialogs/FlagDialog.ui \
     dialogs/RemoteDebugDialog.ui \
     dialogs/NativeDebugDialog.ui \
     dialogs/XrefsDialog.ui \
-    dialogs/NewfileDialog.ui \
+    dialogs/NewFileDialog.ui \
     dialogs/InitialOptionsDialog.ui \
     dialogs/EditFunctionDialog.ui \
     core/MainWindow.ui \
@@ -657,11 +623,12 @@ FORMS    += \
     widgets/FlagsWidget.ui \
     widgets/StringsWidget.ui \
     widgets/HexdumpWidget.ui \
+    widgets/HexPatWidget.ui \
     dialogs/SaveProjectDialog.ui \
-    dialogs/preferences/PreferencesDialog.ui \
-    dialogs/preferences/AppearanceOptionsWidget.ui \
-    dialogs/preferences/GraphOptionsWidget.ui \
-    dialogs/preferences/InitializationFileEditor.ui \
+    dialogs/settings/SettingsDialog.ui \
+    dialogs/settings/AppearanceOptionsWidget.ui \
+    dialogs/settings/GraphOptionsWidget.ui \
+    dialogs/settings/InitializationFileEditor.ui \
     widgets/QuickFilterView.ui \
     widgets/DecompilerWidget.ui \
     widgets/ClassesWidget.ui \
@@ -679,7 +646,9 @@ FORMS    += \
     widgets/ProcessesWidget.ui \
     widgets/BacktraceWidget.ui \
     dialogs/MapFileDialog.ui \
-    dialogs/preferences/DebugOptionsWidget.ui \
+    dialogs/settings/DebugOptionsWidget.ui \
+    dialogs/settings/WebserverOptionsWidget.ui \
+    dialogs/settings/SamplesOptionsWidget.ui \
     widgets/BreakpointWidget.ui \
     dialogs/BreakpointsDialog.ui \
     dialogs/AttachProcDialog.ui \
@@ -687,7 +656,6 @@ FORMS    += \
     dialogs/SetToDataDialog.ui \
     dialogs/EditVariablesDialog.ui \
     widgets/IaitoTreeView.ui \
-    widgets/ComboQuickFilterView.ui \
     dialogs/HexdumpRangeDialog.ui \
     dialogs/WelcomeDialog.ui \
     dialogs/EditMethodDialog.ui \
@@ -695,18 +663,16 @@ FORMS    += \
     widgets/SdbWidget.ui \
     dialogs/LinkTypeDialog.ui \
     widgets/ColorPicker.ui \
-    dialogs/preferences/ColorThemeEditDialog.ui \
+    dialogs/settings/ColorThemeEditDialog.ui \
     widgets/ListDockWidget.ui \
     dialogs/LayoutManager.ui \
     widgets/R2GraphWidget.ui \
-    dialogs/preferences/AnalOptionsWidget.ui
+    widgets/CustomCommandWidget.ui \
+    dialogs/settings/AnalOptionsWidget.ui
 
 RESOURCES += \
     resources.qrc \
-    themes/native/native.qrc \
-    themes/qdarkstyle/dark.qrc \
-    themes/midnight/midnight.qrc \
-    themes/lightstyle/light.qrc
+    themes/engine/engine.qrc
 
 
 DISTFILES += Iaito.astylerc
@@ -717,10 +683,10 @@ unix {
         PREFIX = /usr/local
     }
 
-    icon_file = img/iaito-o.svg
+    icon_file = img/org.radare.iaito.svg
 
-    share_pixmaps.path = $$PREFIX/share/pixmaps
-    share_pixmaps.files = $$icon_file
+    share_icon.path = $$PREFIX/share/icons/hicolor/scalable/apps
+    share_icon.files = $$icon_file
 
 
     desktop_file = org.radare.iaito.desktop
@@ -741,7 +707,7 @@ unix {
     # built-in no need for files atm
     target.path = $$PREFIX/bin
 
-    INSTALLS += target share_appdata share_applications share_pixmaps
+    INSTALLS += target share_appdata share_applications share_icon
 
     # Triggered for example by 'qmake APPIMAGE=1'
     !isEmpty(APPIMAGE){

src/IaitoApplication.cpp

@@ -1,31 +1,49 @@
-#include "common/PythonManager.h"
-#include "common/CrashHandler.h"
 #include "IaitoApplication.h"
-#include "plugins/PluginManager.h"
+#include "IaitoConfig.h"
+#include "R2AiDecompiler.h"
+#include "R2AnotesDecompiler.h"
+#include "R2DecaiDecompiler.h"
 #include "R2GhidraCmdDecompiler.h"
+#include "R2HermesDecompiler.h"
+#include "R2JadxDecompiler.h"
+#include "R2SourceDecompiler.h"
 #include "R2pdcCmdDecompiler.h"
 #include "R2retdecDecompiler.h"
-#include "IaitoConfig.h"
+#include "common/CrashHandler.h"
 #include "common/Decompiler.h"
+#include "common/DeepLink.h"
 #include "common/ResourcePaths.h"
+#include "common/SamplesDB.h"
+#include "common/ShortcutManager.h"
+#include "common/theme/IaitoStyle.h"
+#include "plugins/PluginManager.h"
 
 #include <QApplication>
-#include <QFileOpenEvent>
+#include <QCommandLineParser>
 #include <QEvent>
+#include <QFileOpenEvent>
 #include <QMenu>
 #include <QMessageBox>
-#include <QCommandLineParser>
+#include <QProxyStyle>
+#include <QStyle>
+#include <QStyleHintReturn>
+#include <QStyleOption>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QTextCodec>
-#include <QStringList>
-#include <QProcess>
-#include <QPluginLoader>
+#endif
 #include <QDir>
-#include <QTranslator>
-#include <QLibraryInfo>
 #include <QFontDatabase>
+#include <QLibraryInfo>
+#include <QPluginLoader>
+#include <QProcess>
+#include <QStandardPaths>
+#include <QStringList>
+#include <QTranslator>
+#include <QUrl>
 #ifdef Q_OS_WIN
 #include <QtNetwork/QtNetwork>
 #endif // Q_OS_WIN
+#include <cstring>
 
 #include <cstdlib>
 
@@ -33,16 +51,71 @@
 #include <R2GhidraDecompiler.h>
 #endif
 
-IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc, argv)
+static bool versionCheck()
 {
+    // Check r2 version
+    const QString a = r_core_version(); // runtime library version
+    const QString b = "" R2_GITTAP;     // compiled version
+    const QStringList la = a.split(".");
+    const QStringList lb = b.split(".");
+    if (la.size() < 2 || lb.size() < 2) {
+        R_LOG_WARN("Invalid version string somewhere");
+        return false;
+    }
+    if (la.at(0) != lb.at(0)) {
+        R_LOG_WARN("Major version differs");
+        return false;
+    }
+    if (la.at(1) != lb.at(1)) {
+        R_LOG_WARN("Minor version differs");
+        return false;
+    }
+    return true;
+}
+
+static QtMessageHandler g_previousMessageHandler = nullptr;
+
+static void iaitoMessageHandler(QtMsgType type, const QMessageLogContext &ctx, const QString &msg)
+{
+    // The category is on ctx.category, not inside msg. Drop qt.gui.imageio
+    // entirely (libpng IDAT spam from PNGs shipped inside Qt itself) and any
+    // stray "libpng warning:" text that might arrive without a category.
+    const char *cat = ctx.category;
+    if (cat && !strncmp(cat, "qt.gui.imageio", 14)) {
+        return;
+    }
+    if (msg.contains(QLatin1String("libpng warning:"))) {
+        return;
+    }
+    if (g_previousMessageHandler) {
+        g_previousMessageHandler(type, ctx, msg);
+    } else {
+        QByteArray local = msg.toLocal8Bit();
+        fprintf(stderr, "%s\n", local.constData());
+    }
+}
+
+IaitoApplication::IaitoApplication(int &argc, char **argv)
+    : QApplication(argc, argv)
+    , m_FileAlreadyDropped(false)
+{
+    // Install message handler before widgets load to filter Qt's libpng spam.
+    g_previousMessageHandler = qInstallMessageHandler(iaitoMessageHandler);
+
     // Setup application information
     setApplicationVersion(IAITO_VERSION_FULL);
-    setWindowIcon(QIcon(":/img/iaito-o.svg"));
+#ifndef Q_OS_MACOS
+    setWindowIcon(QIcon(":/img/iaito.svg"));
+#endif
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setAttribute(Qt::AA_UseHighDpiPixmaps);
+#endif
     setLayoutDirection(Qt::LeftToRight);
 
-    // WARN!!! Put initialization code below this line. Code above this line is mandatory to be run First
+    setStyle(new IaitoStyle());
 
+    // WARN!!! Put initialization code below this line. Code above this line is
+    // mandatory to be run First
 #ifdef Q_OS_WIN
     // Hack to force Iaito load internet connection related DLL's
     QSslSocket s;
@@ -67,67 +140,140 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
     if (ret == -1) {
         qWarning() << "Cannot load Incosolata-Regular font.";
     }
-
+    ret = QFontDatabase::addApplicationFont(":/fonts/IBMPlexMono-Regular.ttf");
+    if (ret == -1) {
+        qWarning() << "Cannot load IBM Plex Mono Regular font.";
+    }
+    ret = QFontDatabase::addApplicationFont(":/fonts/IBMPlexMono-Bold.ttf");
+    if (ret == -1) {
+        qWarning() << "Cannot load IBM Plex Mono Bold font.";
+    }
+#if 0
+    ret = QFontDatabase::addApplicationFont(":/fonts/W95FA.otf");
+    if (ret == -1) {
+        qWarning() << "Cannot load W95FA font.";
+    }
+    ret = QFontDatabase::addApplicationFont(":/fonts/CourierPixel.otf");
+    if (ret == -1) {
+        qWarning() << "Cannot load Courier Pixel font.";
+    }
+#endif
+    ret = QFontDatabase::addApplicationFont(":/fonts/windows.ttf");
+    if (ret == -1) {
+        qWarning() << "Cannot load Windows font.";
+    }
 
     // Set QString codec to UTF-8
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QTextCodec::setCodecForLocale(QTextCodec::codecForName("UTF-8"));
-#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
     QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
 #endif
-
+#endif
     if (!parseCommandLineOptions()) {
-        std::exit(1);
+        return;
     }
 
-    // Check r2 version
-    QString r2version = r_core_version();
-    QString localVersion = "" R2_GITTAP;
-    if (localVersion != "" && r2version != "" && r2version != localVersion) {
+    if (!versionCheck()) {
         QMessageBox msg;
         msg.setIcon(QMessageBox::Critical);
         msg.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
         msg.setWindowTitle(QObject::tr("Version mismatch!"));
+        QString localVersion = r_core_version();
+        QString r2version = R2_GITTAP;
         msg.setText(QString(
-                        QObject::tr("The version used to compile Iaito (%1) does not match the binary version of radare2 (%2). This could result in unexpected behaviour. Are you sure you want to continue?")).arg(
-                        localVersion, r2version));
+                        QObject::tr(
+                            "The version used to compile Iaito (%1) does not match the "
+                            "binary version of radare2 (%2). This could result in "
+                            "unexpected behaviour. Are you sure you want to continue?"))
+                        .arg(localVersion, r2version));
         if (msg.exec() == QMessageBox::No) {
-            std::exit(1);
+            QCoreApplication::exit();
+            // std::exit(1);
         }
     }
 
-#ifdef IAITO_ENABLE_PYTHON
-    // Init python
-    if (!clOptions.pythonHome.isEmpty()) {
-        Python()->setPythonHome(clOptions.pythonHome);
-    }
-    Python()->initialize();
-#endif
-
 #ifdef Q_OS_WIN
     // Redefine r_sys_prefix() behaviour
     qputenv("R_ALT_SRC_DIR", "1");
 #endif
 
+#ifdef MACOS_R2_BUNDLED
+    {
+        auto appdir = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS
+        appdir.cdUp();                                              // Contents
+
+        auto r2prefix = appdir;           // Contents
+        r2prefix.cd("Resources/radare2"); // Contents/Resources/radare2
+        qputenv("R2_PREFIX", r2prefix.absolutePath().toLocal8Bit());
+
+        auto r2www = appdir; // Contents
+        r2www.cd("Resources/radare2/share/radare2/last/www");
+        qputenv("R2_WWWROOT", r2www.absolutePath().toLocal8Bit());
+
+        auto r2bin = appdir; // Contents
+        r2bin.cd("Helpers"); // Contents/Helpers
+        auto paths = QStringList(QString::fromLocal8Bit(qgetenv("PATH")));
+        paths.prepend(r2bin.absolutePath());
+        qputenv("PATH", paths.join(QLatin1Char(':')).toLocal8Bit());
+
+        auto sleighHome = appdir; // Contents
+        sleighHome.cd(
+            "Resources/radare2/share/r2ghidra_sleigh"); // Contents/Resources/radare2/share/r2ghidra_sleigh
+        qputenv("SLEIGHHOME", sleighHome.absolutePath().toLocal8Bit());
+
+        // Allow bundled radare2 and its plugins to save its data inside iaito app folders
+        qputenv(
+            "XDG_CACHE_HOME",
+            QStandardPaths::writableLocation(QStandardPaths::CacheLocation).toLocal8Bit());
+        qputenv(
+            "XDG_CONFIG_HOME",
+            QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toLocal8Bit());
+        qputenv(
+            "XDG_DATA_HOME",
+            QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toLocal8Bit());
+    }
+#endif
+
     Core()->initialize(clOptions.enableR2Plugins);
     Core()->setSettings();
     Config()->loadInitial();
-    Core()->loadIaitoRC();
+    Core()->loadIaitoRC(0);
+    ShortcutMgr()->migrateLegacyCommandKeys();
 
     Config()->setOutputRedirectionEnabled(clOptions.outputRedirectionEnabled);
 
     if (R2pdcCmdDecompiler::isAvailable()) {
         Core()->registerDecompiler(new R2pdcCmdDecompiler(Core()));
     }
+    if (R2SourceDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2SourceDecompiler(Core()));
+    }
     if (R2retdecDecompiler::isAvailable()) {
         Core()->registerDecompiler(new R2retdecDecompiler(Core()));
     }
     if (R2DecDecompiler::isAvailable()) {
         Core()->registerDecompiler(new R2DecDecompiler(Core()));
     }
+    if (R2JadxDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2JadxDecompiler(Core()));
+    }
+    if (R2DecaiDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2DecaiDecompiler(Core()));
+    }
+    if (R2AiDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2AiDecompiler(Core()));
+    }
     if (R2GhidraCmdDecompiler::isAvailable()) {
         Core()->registerDecompiler(new R2GhidraCmdDecompiler(Core()));
     }
+    if (R2AnotesDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2AnotesDecompiler(Core()));
+    }
+    if (R2HermesDecompiler::isAvailable()) {
+        Core()->registerDecompiler(new R2HermesDecompiler(Core()));
+    }
 
 #if IAITO_R2GHIDRA_STATIC
     Core()->registerDecompiler(new R2GhidraDecompiler(Core()));
@@ -142,15 +288,16 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
     mainWindow = new MainWindow();
     installEventFilter(mainWindow);
 
-    // set up context menu shortcut display fix
-#if QT_VERSION_CHECK(5, 10, 0) < QT_VERSION
-    setStyle(new IaitoProxyStyle());
-#endif // QT_VERSION_CHECK(5, 10, 0) < QT_VERSION
-
-    if (clOptions.args.empty()) {
+    RCore *kore = iaitoPluginCore();
+    if (kore) {
+        mainWindow->openCurrentCore(clOptions.fileOpenOptions, false);
+    } else if (!clOptions.deepLinkUrl.isEmpty()) {
+        DeepLink::handle(mainWindow, clOptions.deepLinkUrl);
+    } else if (clOptions.args.empty()) {
         // check if this is the first execution of Iaito in this computer
-        // Note: the execution after the preferences been reset, will be considered as first-execution
-        if (Config()->isFirstExecution()) {
+        // Note: the execution after the settings been reset, will be
+        // considered as first-execution
+        if (clOptions.showWelcomeDialog || Config()->isFirstExecution()) {
             mainWindow->displayWelcomeDialog();
         }
         mainWindow->displayNewFileDialog();
@@ -175,22 +322,6 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
     }
 #endif
 
-#ifdef Q_OS_MACOS
-    {
-        auto r2prefix = QDir(QCoreApplication::applicationDirPath()); // Contents/MacOS
-        r2prefix.cdUp(); // Contents
-        r2prefix.cd("Resources/r2"); // Contents/Resources/r2
-
-        auto sleighHome = r2prefix;
-        sleighHome.cd("share/radare2/plugins/r2ghidra_sleigh"); // Contents/Resources/r2/share/radare2/plugins/r2ghidra_sleigh
-        Core()->setConfig("r2ghidra.sleighhome", sleighHome.absolutePath());
-
-        auto r2decHome = r2prefix;
-        r2decHome.cd("share/radare2/plugins/r2dec-js"); // Contents/Resources/r2/share/radare2/plugins/r2dec-js
-        qputenv("R2DEC_HOME", r2decHome.absolutePath().toLocal8Bit());
-    }
-#endif
-
 #ifdef IAITO_APPVEYOR_R2DEC
     qputenv("R2DEC_HOME", "lib\\plugins\\r2dec-js");
 #endif
@@ -206,11 +337,11 @@ IaitoApplication::IaitoApplication(int &argc, char **argv) : QApplication(argc,
 
 IaitoApplication::~IaitoApplication()
 {
-    Plugins()->destroyPlugins();
-    delete mainWindow;
-#ifdef IAITO_ENABLE_PYTHON
-    Python()->shutdown();
-#endif
+    if (mainWindow) {
+        SamplesDB::waitForPending();
+        Plugins()->destroyPlugins();
+        delete mainWindow;
+    }
 }
 
 void IaitoApplication::launchNewInstance(const QStringList &args)
@@ -231,15 +362,28 @@ void IaitoApplication::launchNewInstance(const QStringList &args)
 bool IaitoApplication::event(QEvent *e)
 {
     if (e->type() == QEvent::FileOpen) {
+        RCore *kore = iaitoPluginCore();
+        if (kore) {
+            return false;
+        }
         QFileOpenEvent *openEvent = static_cast<QFileOpenEvent *>(e);
         if (openEvent) {
+            const QUrl url = openEvent->url();
+            const bool isDeep = DeepLink::isDeepLink(url.toString());
             if (m_FileAlreadyDropped) {
-                // We already dropped a file in macOS, let's spawn another instance
-                // (Like the File -> Open)
-                QString fileName = openEvent->file();
-                launchNewInstance({fileName});
+                // We already dropped a file in macOS, let's spawn another
+                // instance (Like the File -> Open)
+                launchNewInstance({isDeep ? url.toString() : openEvent->file()});
+            } else if (isDeep) {
+                m_FileAlreadyDropped = true;
+                mainWindow->closeNewFileDialog();
+                DeepLink::handle(mainWindow, url.toString());
             } else {
                 QString fileName = openEvent->file();
+                // eprintf ("FILE %s\n", fileName.toStdString().c_str());
+                if (fileName == "") {
+                    return false;
+                }
                 m_FileAlreadyDropped = true;
                 mainWindow->closeNewFileDialog();
                 InitialOptions options;
@@ -257,8 +401,8 @@ bool IaitoApplication::loadTranslations()
     if (language == QStringLiteral("en") || language.startsWith(QStringLiteral("en-"))) {
         return true;
     }
-    const auto &allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript,
-                                                      QLocale::AnyCountry);
+    const auto &allLocales
+        = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry);
 
     bool iaitoTrLoaded = false;
 
@@ -273,10 +417,11 @@ bool IaitoApplication::loadTranslations()
             QTranslator *trQtBase = new QTranslator;
             QTranslator *trQt = new QTranslator;
 
-            const QStringList &cutterTrPaths = Iaito::getTranslationsDirectories();
+            const QStringList &iaitoTrPaths = Iaito::getTranslationsDirectories();
 
-            for (const auto &trPath : cutterTrPaths) {
-                if (trIaito && trIaito->load(it, QLatin1String("iaito"), QLatin1String("_"), trPath)) {
+            for (const auto &trPath : iaitoTrPaths) {
+                if (trIaito
+                    && trIaito->load(it, QLatin1String("iaito"), QLatin1String("_"), trPath)) {
                     installTranslator(trIaito);
                     iaitoTrLoaded = true;
                     trIaito = nullptr;
@@ -321,73 +466,107 @@ bool IaitoApplication::parseCommandLineOptions()
     cmd_parser.addVersionOption();
     cmd_parser.addPositionalArgument("filename", QObject::tr("Filename to open."));
 
-    QCommandLineOption analOption({"A", "analysis"},
-                                  QObject::tr("Automatically open file and optionally start analysis. "
-                                              "Needs filename to be specified. May be a value between 0 and 2:"
-                                              " 0 = no analysis, 1 = aaa, 2 = aaaa (experimental)"),
-                                  QObject::tr("level"));
+    QCommandLineOption environmentOption(
+        "H", QObject::tr("List environment variables, or print the value of a selected variable."));
+    cmd_parser.addOption(environmentOption);
+
+    QCommandLineOption analOption(
+        {"A", "analysis"},
+        QObject::tr(
+            "Automatically open file and optionally start analysis. "
+            "Needs filename to be specified. May be a value between 0 and 3:"
+            " 0 = no analysis, 1 = aa, 2 = aaa, 3 = aaaa (slow)"),
+        QObject::tr("level"));
     cmd_parser.addOption(analOption);
 
-    QCommandLineOption formatOption({"F", "format"},
-                                    QObject::tr("Force using a specific file format (bin plugin)"),
-                                    QObject::tr("name"));
+    QCommandLineOption formatOption(
+        {"F", "format"},
+        QObject::tr("Force using a specific file format (bin plugin)"),
+        QObject::tr("name"));
     cmd_parser.addOption(formatOption);
 
-    QCommandLineOption baddrOption({"B", "base"},
-                                   QObject::tr("Load binary at a specific base address"),
-                                   QObject::tr("base address"));
+    QCommandLineOption baddrOption(
+        {"B", "base"},
+        QObject::tr("Load binary at a specific base address"),
+        QObject::tr("base address"));
     cmd_parser.addOption(baddrOption);
 
-    QCommandLineOption scriptOption("i",
-                                    QObject::tr("Run script file"),
-                                    QObject::tr("file"));
+    QCommandLineOption mapaddrOption(
+        {"m", "map"}, QObject::tr("Map the file at a specific address"), QObject::tr("map address"));
+    cmd_parser.addOption(mapaddrOption);
+
+    QCommandLineOption scriptOption("i", QObject::tr("Run script file"), QObject::tr("file"));
     cmd_parser.addOption(scriptOption);
 
-    QCommandLineOption writeModeOption({"w", "writemode"},
-                                       QObject::tr("Open file in write mode"));
+    QCommandLineOption writeModeOption({"w", "writemode"}, QObject::tr("Open file in write mode"));
     cmd_parser.addOption(writeModeOption);
 
-    QCommandLineOption binCacheOption({"c", "bincache"},
-                                       QObject::tr("Enable bin.cache to make relocs work"));
-    cmd_parser.addOption(writeModeOption);
+    QCommandLineOption
+        binCacheOption({"c", "bincache"}, QObject::tr("Patch relocs (enable bin.cache)"));
+    cmd_parser.addOption(binCacheOption);
 
-
-    QCommandLineOption pythonHomeOption("pythonhome",
-                                        QObject::tr("PYTHONHOME to use for embedded python interpreter"),
-                                        "PYTHONHOME");
-    cmd_parser.addOption(pythonHomeOption);
-
-    QCommandLineOption disableRedirectOption("no-output-redirect",
-                                             QObject::tr("Disable output redirection."
-                                                         " Some of the output in console widget will not be visible."
-                                                         " Use this option when debuging a crash or freeze and output "
-                                                         " redirection is causing some messages to be lost."));
+    QCommandLineOption disableRedirectOption(
+        "no-output-redirect",
+        QObject::tr(
+            "Disable output redirection."
+            " Some of the output in console widget will not be visible."
+            " Use this option when debuging a crash or freeze and output "
+            " redirection is causing some messages to be lost."));
     cmd_parser.addOption(disableRedirectOption);
 
-    QCommandLineOption disablePlugins("no-plugins",
-                                      QObject::tr("Do not load plugins"));
+    QCommandLineOption disablePlugins("no-plugins", QObject::tr("Do not load plugins"));
     cmd_parser.addOption(disablePlugins);
 
-    QCommandLineOption disableIaitoPlugins("no-iaito-plugins",
-                                            QObject::tr("Do not load Iaito plugins"));
+    QCommandLineOption
+        disableIaitoPlugins("no-iaito-plugins", QObject::tr("Do not load Iaito plugins"));
     cmd_parser.addOption(disableIaitoPlugins);
 
-    QCommandLineOption disableR2Plugins("no-r2-plugins",
-                                        QObject::tr("Do not load radare2 plugins"));
+    QCommandLineOption disableR2Plugins("no-r2-plugins", QObject::tr("Do not load radare2 plugins"));
     cmd_parser.addOption(disableR2Plugins);
 
-    cmd_parser.process(*this);
+    QCommandLineOption welcomeOption("welcome", QObject::tr("Show welcome dialog."));
+    cmd_parser.addOption(welcomeOption);
+
+#ifdef IAITO_ENABLE_DEBUGGER
+    QCommandLineOption debugOption(
+        {"d", "debug"},
+        QObject::tr(
+            "Open the positional argument in debug mode. The argument may be a"
+            " path to an executable to run or a numeric PID to attach to."));
+    cmd_parser.addOption(debugOption);
+#endif
+
+    // process() exits without destroying QApplication for --version.
+    const bool parsed = cmd_parser.parse(arguments());
+    if (parsed && cmd_parser.isSet("version")) {
+        printf("%s %s\n", qPrintable(applicationName()), qPrintable(applicationVersion()));
+        exitCode = 0;
+        return false;
+    }
+    if (!parsed || cmd_parser.isSet("help") || cmd_parser.isSet("help-all")) {
+        cmd_parser.process(*this);
+    }
 
     IaitoCommandLineOptions opts;
     opts.args = cmd_parser.positionalArguments();
 
+    // An iaito:// deep link is passed as the positional argument by the OS URI
+    // handler. Pull it out so it is not treated as a regular filename.
+    if (!opts.args.isEmpty() && DeepLink::isDeepLink(opts.args.first())) {
+        opts.deepLinkUrl = opts.args.takeFirst();
+    }
+
     if (cmd_parser.isSet(analOption)) {
         bool analLevelSpecified = false;
         int analLevel = cmd_parser.value(analOption).toInt(&analLevelSpecified);
 
-        if (!analLevelSpecified || analLevel < 0 || analLevel > 2) {
-            fprintf(stderr, "%s\n",
-                    QObject::tr("Invalid Analysis Level. May be a value between 0 and 2.").toLocal8Bit().constData());
+        if (!analLevelSpecified || analLevel < 0 || analLevel > 3) {
+            fprintf(
+                stderr,
+                "%s\n",
+                QObject::tr("Invalid Analysis Level. May be a value between 0 and 3.")
+                    .toLocal8Bit()
+                    .constData());
             return false;
         }
         switch (analLevel) {
@@ -400,16 +579,22 @@ bool IaitoApplication::parseCommandLineOptions()
         case 2:
             opts.analLevel = AutomaticAnalysisLevel::AAAA;
             break;
+        case 3:
+            opts.analLevel = AutomaticAnalysisLevel::AAAAA;
+            break;
         }
     }
 
     if (opts.args.empty() && opts.analLevel != AutomaticAnalysisLevel::Ask) {
-        fprintf(stderr, "%s\n",
-                QObject::tr("Filename must be specified to start analysis automatically.").toLocal8Bit().constData());
+        fprintf(
+            stderr,
+            "%s\n",
+            QObject::tr("Filename must be specified to start analysis automatically.")
+                .toLocal8Bit()
+                .constData());
         return false;
     }
 
-    InitialOptions options;
     if (!opts.args.isEmpty()) {
         opts.fileOpenOptions.filename = opts.args[0];
         opts.fileOpenOptions.forceBinPlugin = cmd_parser.value(formatOption);
@@ -417,7 +602,14 @@ bool IaitoApplication::parseCommandLineOptions()
             bool ok;
             RVA baddr = cmd_parser.value(baddrOption).toULongLong(&ok, 0);
             if (ok) {
-                options.binLoadAddr = baddr;
+                opts.fileOpenOptions.binLoadAddr = baddr;
+            }
+        }
+        if (cmd_parser.isSet(mapaddrOption)) {
+            bool ok;
+            RVA mapaddr = cmd_parser.value(mapaddrOption).toULongLong(&ok, 0);
+            if (ok) {
+                opts.fileOpenOptions.mapAddr = mapaddr;
             }
         }
         switch (opts.analLevel) {
@@ -427,19 +619,33 @@ bool IaitoApplication::parseCommandLineOptions()
             opts.fileOpenOptions.analCmd = {};
             break;
         case AutomaticAnalysisLevel::AAA:
-            opts.fileOpenOptions.analCmd = { {"aaa", "Auto analysis"} };
+            opts.fileOpenOptions.analCmd = {{"aaa", "Auto analysis"}};
             break;
         case AutomaticAnalysisLevel::AAAA:
-            opts.fileOpenOptions.analCmd = { {"aaaa", "Auto analysis (experimental)"} };
+            opts.fileOpenOptions.analCmd = {{"aaaa", "Advanced analysis"}};
+            break;
+        case AutomaticAnalysisLevel::AAAAA:
+            opts.fileOpenOptions.analCmd = {{"aaaaa", "Auto analysis (experimental)"}};
             break;
         }
         opts.fileOpenOptions.script = cmd_parser.value(scriptOption);
 
         opts.fileOpenOptions.writeEnabled = cmd_parser.isSet(writeModeOption);
-    }
 
-    if (cmd_parser.isSet(pythonHomeOption)) {
-        opts.pythonHome = cmd_parser.value(pythonHomeOption);
+#ifdef IAITO_ENABLE_DEBUGGER
+        if (cmd_parser.isSet(debugOption)) {
+            // -d: open the target as a debug session. If the positional
+            // argument is numeric, treat it as a PID to attach to; otherwise
+            // treat it as a path to an executable to run under the debugger.
+            const QString &target = opts.args[0];
+            bool isPid = false;
+            target.toLongLong(&isPid);
+            if (isPid) {
+                opts.fileOpenOptions.filename = QStringLiteral("dbg://%1").arg(target);
+            }
+            opts.fileOpenOptions.debug = true;
+        }
+#endif
     }
 
     opts.outputRedirectionEnabled = !cmd_parser.isSet(disableRedirectOption);
@@ -456,23 +662,24 @@ bool IaitoApplication::parseCommandLineOptions()
         opts.enableR2Plugins = false;
     }
 
+    if (cmd_parser.isSet(welcomeOption)) {
+        opts.showWelcomeDialog = true;
+    }
+
     this->clOptions = opts;
     return true;
 }
 
-
-void IaitoProxyStyle::polish(QWidget *widget)
+bool IaitoApplication::notify(QObject *receiver, QEvent *event)
 {
-    QProxyStyle::polish(widget);
 #if QT_VERSION_CHECK(5, 10, 0) < QT_VERSION
-    // HACK: This is the only way I've found to force Qt (5.10 and newer) to
-    //       display shortcuts in context menus on all platforms. It's ugly,
-    //       but it gets the job done.
-    if (auto menu = qobject_cast<QMenu *>(widget)) {
-        const auto &actions = menu->actions();
-        for (auto action : actions) {
-            action->setShortcutVisibleInContextMenu(true);
+    if (event->type() == QEvent::Polish) {
+        if (auto menu = qobject_cast<QMenu *>(receiver)) {
+            for (auto action : menu->actions()) {
+                action->setShortcutVisibleInContextMenu(true);
+            }
         }
     }
-#endif // QT_VERSION_CHECK(5, 10, 0) < QT_VERSION
+#endif
+    return QApplication::notify(receiver, event);
 }

src/IaitoApplication.h

@@ -1,25 +1,24 @@
 #ifndef IAITOAPPLICATION_H
 #define IAITOAPPLICATION_H
 
-#include <QEvent>
 #include <QApplication>
+#include <QEvent>
 #include <QList>
-#include <QProxyStyle>
 
 #include "core/MainWindow.h"
 
-enum class AutomaticAnalysisLevel {
-    Ask, None, AAA, AAAA
-};
+enum class AutomaticAnalysisLevel { Ask, None, AAA, AAAA, AAAAA };
 
-struct IaitoCommandLineOptions {
+struct IaitoCommandLineOptions
+{
     QStringList args;
     AutomaticAnalysisLevel analLevel = AutomaticAnalysisLevel::Ask;
     InitialOptions fileOpenOptions;
-    QString pythonHome;
     bool outputRedirectionEnabled = true;
     bool enableIaitoPlugins = true;
     bool enableR2Plugins = true;
+    bool showWelcomeDialog = false;
+    QString deepLinkUrl;
 };
 
 class IaitoApplication : public QApplication
@@ -30,14 +29,14 @@ public:
     IaitoApplication(int &argc, char **argv);
     ~IaitoApplication();
 
-    MainWindow *getMainWindow()
-    {
-        return mainWindow;
-    }
+    MainWindow *getMainWindow() { return mainWindow; }
+    int getExitCode() const { return exitCode; }
 
     void launchNewInstance(const QStringList &args = {});
+
 protected:
-    bool event(QEvent *e);
+    bool event(QEvent *e) override;
+    bool notify(QObject *receiver, QEvent *event) override;
 
 private:
     /**
@@ -50,24 +49,12 @@ private:
      * @return false if options have error
      */
     bool parseCommandLineOptions();
+
 private:
     bool m_FileAlreadyDropped;
-    MainWindow *mainWindow;
+    MainWindow *mainWindow = nullptr;
+    int exitCode = 1;
     IaitoCommandLineOptions clOptions;
 };
 
-
-/**
- * @brief IaitoProxyStyle is used to force shortcuts displaying in context menu
- */
-class IaitoProxyStyle : public QProxyStyle
-{
-    Q_OBJECT
-public:
-    /**
-     * @brief it is enough to get notification about QMenu polishing to force shortcut displaying
-     */
-    void polish(QWidget *widget) override;
-};
-
 #endif // IAITOAPPLICATION_H

src/Main.cpp

@@ -1,15 +1,78 @@
 
 #include "IaitoApplication.h"
-#include "core/MainWindow.h"
-#include "common/UpdateWorker.h"
 #include "IaitoConfig.h"
 #include "common/CrashHandler.h"
-#include "common/SettingsUpgrade.h"
+#include "core/MainWindow.h"
 
-#include <QJsonObject>
-#include <QJsonArray>
 #include <iostream>
+#include <QDir>
+#include <QJsonArray>
+#include <QJsonObject>
 
+#include <cstdio>
+#include <cstring>
+
+#ifdef Q_OS_WIN
+static void connectToConsole();
+#endif
+
+static bool printEnvironmentVariables(int argc, char *argv[])
+{
+    for (int i = 1; i < argc; i++) {
+        if (!std::strcmp(argv[i], "--")) {
+            return false;
+        }
+        if (std::strncmp(argv[i], "-H", 2)) {
+            continue;
+        }
+        const char *selectedVariable = nullptr;
+        if (argv[i][2]) {
+            selectedVariable = argv[i] + 2;
+        } else if (i + 1 < argc && argv[i + 1][0] != '-') {
+            selectedVariable = argv[i + 1];
+        }
+#ifdef Q_OS_WIN
+        connectToConsole();
+#endif
+        QByteArray extraPluginDirs = IAITO_EXTRA_PLUGIN_DIRS;
+        const QByteArray environmentPluginDirs = qgetenv("IAITO_EXTRA_PLUGIN_DIRS");
+        if (!environmentPluginDirs.isEmpty()) {
+            if (!extraPluginDirs.isEmpty()) {
+                extraPluginDirs.append(QDir::listSeparator().toLatin1());
+            }
+            extraPluginDirs.append(environmentPluginDirs);
+        }
+        struct EnvironmentVariable
+        {
+            const char *name;
+            QByteArray value;
+        };
+        const EnvironmentVariable variables[] = {
+            {"IAITO_VERSION", IAITO_VERSION_FULL},
+            {"IAITO_VERSION_MAJOR", QByteArray::number(IAITO_VERSION_MAJOR)},
+            {"IAITO_VERSION_MINOR", QByteArray::number(IAITO_VERSION_MINOR)},
+            {"IAITO_VERSION_PATCH", QByteArray::number(IAITO_VERSION_PATCH)},
+            {"IAITO_EXTRA_PLUGIN_DIRS", extraPluginDirs},
+            {"R2_DEBUG", qgetenv("R2_DEBUG")},
+            {"R2_NOPLUGINS", qgetenv("R2_NOPLUGINS")},
+        };
+        for (const auto &variable : variables) {
+            const char *shortName = std::strchr(variable.name, '_');
+            shortName = shortName ? shortName + 1 : variable.name;
+            if (selectedVariable && std::strcmp(selectedVariable, variable.name)
+                && std::strcmp(selectedVariable, shortName)) {
+                continue;
+            }
+            if (selectedVariable) {
+                std::fprintf(stdout, "%s\n", variable.value.constData());
+            } else {
+                std::fprintf(stdout, "%s=%s\n", variable.name, variable.value.constData());
+            }
+        }
+        return true;
+    }
+    return false;
+}
 
 /**
  * @brief Attempt to connect to a parent console and configure outputs.
@@ -23,8 +86,9 @@ static void connectToConsole()
         return;
     }
 
-    // Avoid reconfiguring stderr/stdout if one of them is already connected to a stream.
-    // This can happen when running with stdout/stderr redirected to a file.
+    // Avoid reconfiguring stderr/stdout if one of them is already connected to
+    // a stream. This can happen when running with stdout/stderr redirected to a
+    // file.
     if (0 > fileno(stdout)) {
         // Overwrite FD 1 and 2 for the benefit of any code that uses the FDs
         // directly.  This is safe because the CRT allocates FDs 0, 1 and
@@ -34,7 +98,8 @@ static void connectToConsole()
         _close(1);
 
         if (freopen("CONOUT$", "a+", stdout)) {
-            // Avoid buffering stdout/stderr since IOLBF is replaced by IOFBF in Win32.
+            // Avoid buffering stdout/stderr since IOLBF is replaced by IOFBF in
+            // Win32.
             setvbuf(stdout, nullptr, _IONBF, 0);
         }
     }
@@ -51,9 +116,12 @@ static void connectToConsole()
 }
 #endif
 
-
 int main(int argc, char *argv[])
 {
+    if (printEnvironmentVariables(argc, argv)) {
+        return 0;
+    }
+
     if (argc >= 3 && QString::fromLocal8Bit(argv[1]) == "--start-crash-handler") {
         QApplication app(argc, argv);
         QString dumpLocation = QString::fromLocal8Bit(argv[2]);
@@ -71,37 +139,30 @@ int main(int argc, char *argv[])
     qRegisterMetaType<QList<FunctionDescription>>();
 
     QCoreApplication::setOrganizationName("radareorg");
+    QCoreApplication::setOrganizationDomain("radare.org");
     QCoreApplication::setApplicationName("iaito");
+    QGuiApplication::setDesktopFileName("org.radare.iaito");
 
-    Iaito::initializeSettings();
-
-    QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts); // needed for QtWebEngine inside Plugins
+    QCoreApplication::setAttribute(
+        Qt::AA_ShareOpenGLContexts); // needed for QtWebEngine inside Plugins
 #ifdef Q_OS_WIN
     QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-    #if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
-    #endif
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+    QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
+        Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
+#endif
 #endif
 
     IaitoApplication a(argc, argv);
-
-    Iaito::migrateThemes();
-
-    if (Config()->getAutoUpdateEnabled()) {
-#if IAITO_UPDATE_WORKER_AVAILABLE
-        UpdateWorker *updateWorker = new UpdateWorker;
-        QObject::connect(updateWorker, &UpdateWorker::checkComplete,
-                         [=](const QVersionNumber &version, const QString & error) {
-            if (error.isEmpty() && version > UpdateWorker::currentVersionNumber()) {
-                updateWorker->showUpdateDialog(true);
-            }
-            updateWorker->deleteLater();
-        });
-        updateWorker->checkCurrentVersion(7000);
-#endif
+    if (!a.getMainWindow()) {
+        return a.getExitCode();
     }
 
-    int ret = a.exec();
+    return a.exec();
+}
 
-    return ret;
+int main_iaito()
+{
+    char *argv[] = {(char *) "iaito"};
+    return main(1, argv);
 }

src/Makefile

@@ -1,5 +0,0 @@
-all: ../build
-	$(MAKE) -C ../build
-
-../build:
-	$(MAKE) -C ..

src/assert.h

@@ -0,0 +1,8 @@
+#ifndef CUSTOM_ASSERT_H
+#define CUSTOM_ASSERT_H 1
+
+#define assert(x) \
+    if ((x)) { \
+    }
+
+#endif