Proper installers for all platforms

Windows: NSIS setup.exe — double-click to install with Start Menu shortcuts, desktop icon, uninstaller in Add/Remove Programs. Tor bundled in tor/ subfolder, auto-detected by wallet. Linux: .deb packages (dpkg -i) for both Qt wallet and daemon. Wallet gets desktop entry + app icon. Daemon gets systemd service. Tor bundled in /usr/lib/cryptographic-triangles/tor/. macOS: DMG with Tor inside .app bundle (unchanged). All platforms: download one file, install, run. Zero configuration.
2026-04-02 22:11:29 -07:00
parent c2e5cf4330
commit 7ca970d998
2 changed files with 252 additions and 61 deletions
@@ -63,6 +63,13 @@ jobs:
          ln -sf /mingw64/bin/lrelease-qt5.exe /mingw64/bin/lrelease.exe 2>/dev/null || true
          ln -sf /mingw64/bin/windeployqt-qt5.exe /mingw64/bin/windeployqt.exe 2>/dev/null || true

+      - name: Set VERSION from source
+        run: |
+          MAJOR=$(grep 'CLIENT_VERSION_MAJOR' src/clientversion.h | awk '{print $3}')
+          MINOR=$(grep 'CLIENT_VERSION_MINOR' src/clientversion.h | awk '{print $3}')
+          REV=$(grep 'CLIENT_VERSION_REVISION' src/clientversion.h | awk '{print $3}')
+          echo "VERSION=${MAJOR}.${MINOR}.${REV}" >> $GITHUB_ENV
+
      - name: Clean stale build artifacts
        run: rm -rf build/*.o build/*.h

@@ -73,27 +80,22 @@ jobs:
          CC=gcc CXX=g++ TARGET_OS=OS_WINDOWS_CROSSCOMPILE make OPT="-fno-keep-inline-dllexport -march=nocona -msahf -mtune=generic -Wa,-mbig-obj -O2" libleveldb.a libmemenv.a

      - name: Run qmake
-        run: |
-          qmake triangles-qt.pro "RELEASE=1"
+        run: qmake triangles-qt.pro "RELEASE=1"

      - name: Build
-        run: |
-          make -j$(nproc)
+        run: make -j$(nproc)

      - name: Package
        run: |
          mkdir -p dist
          cp release/triangles-qt.exe dist/
          windeployqt dist/triangles-qt.exe || true
-          # Copy runtime DLLs
          for dll in libgcc_s_seh-1.dll libstdc++-6.dll libwinpthread-1.dll; do
            cp /mingw64/bin/$dll dist/ 2>/dev/null || true
          done
+          strip --strip-all dist/triangles-qt.exe

-      - name: Strip binary
-        run: strip --strip-all dist/triangles-qt.exe
-
-      - name: Bundle Tor
+      - name: Download Tor
        shell: powershell
        run: |
          $TOR_VERSION = "14.0.8"
@@ -101,21 +103,28 @@ jobs:
          Invoke-WebRequest -Uri $TOR_URL -OutFile tor-bundle.tar.gz
          New-Item -ItemType Directory -Path tor-extract -Force
          tar -xzf tor-bundle.tar.gz -C tor-extract
-          New-Item -ItemType Directory -Path dist/tor -Force
-          Copy-Item tor-extract/tor/tor.exe dist/tor/
-          Copy-Item tor-extract/tor/tor-gencert.exe dist/tor/ -ErrorAction SilentlyContinue
+          New-Item -ItemType Directory -Path tor-files -Force
+          Copy-Item tor-extract/tor/tor.exe tor-files/
+          Copy-Item tor-extract/tor/tor-gencert.exe tor-files/ -ErrorAction SilentlyContinue
          if (Test-Path tor-extract/tor/pluggable_transports) {
-            Copy-Item -Recurse tor-extract/tor/pluggable_transports dist/tor/
+            Copy-Item -Recurse tor-extract/tor/pluggable_transports tor-files/
          }
          if (Test-Path tor-extract/data) {
-            Copy-Item -Recurse tor-extract/data dist/tor/data
+            Copy-Item -Recurse tor-extract/data tor-files/data
          }

-      - name: Upload artifact
+      - name: Build NSIS installer
+        shell: powershell
+        run: |
+          choco install nsis -y
+          $env:PATH = "C:\Program Files (x86)\NSIS;$env:PATH"
+          makensis /DVERSION=$env:VERSION contrib\nsis\setup.nsi
+
+      - name: Upload installer
        uses: actions/upload-artifact@v4
        with:
-          name: windows-qt
-          path: dist/
+          name: windows-qt-setup
+          path: contrib/nsis/Cryptographic-Triangles-*-setup.exe

  build-windows-daemon:
    runs-on: windows-latest
@@ -153,26 +162,11 @@ jobs:
          strip --strip-all trianglesd.exe
          cp trianglesd.exe ../trianglesd.exe

-      - name: Bundle Tor
-        shell: powershell
-        run: |
-          $TOR_VERSION = "14.0.8"
-          $TOR_URL = "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-windows-x86_64-${TOR_VERSION}.tar.gz"
-          Invoke-WebRequest -Uri $TOR_URL -OutFile tor-bundle.tar.gz
-          New-Item -ItemType Directory -Path tor-extract -Force
-          tar -xzf tor-bundle.tar.gz -C tor-extract
-          New-Item -ItemType Directory -Path daemon-dist/tor -Force
-          Copy-Item trianglesd.exe daemon-dist/
-          Copy-Item tor-extract/tor/tor.exe daemon-dist/tor/
-          if (Test-Path tor-extract/data) {
-            Copy-Item -Recurse tor-extract/data daemon-dist/tor/data
-          }
-
      - name: Upload artifact
        uses: actions/upload-artifact@v4
        with:
          name: windows-daemon
-          path: daemon-dist/
+          path: trianglesd.exe

  build-linux-qt:
    runs-on: ubuntu-22.04
@@ -212,22 +206,66 @@ jobs:
      - name: Strip binary
        run: strip --strip-all triangles-qt

-      - name: Bundle Tor
+      - name: Build .deb package
        run: |
          TOR_VERSION="14.0.8"
          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
          mkdir -p tor-extract && tar -xzf tor-bundle.tar.gz -C tor-extract
-          mkdir -p linux-qt-dist/tor
-          mv triangles-qt "linux-qt-dist/Cryptographic-Triangles-v${VERSION}-linux-x64-qt"
-          cp tor-extract/tor/tor linux-qt-dist/tor/
-          chmod +x linux-qt-dist/tor/tor
-          cp -r tor-extract/data linux-qt-dist/tor/data

-      - name: Upload artifact
+          PKG="cryptographic-triangles_${VERSION}_amd64"
+          mkdir -p ${PKG}/DEBIAN
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/tor
+          mkdir -p ${PKG}/usr/bin
+          mkdir -p ${PKG}/usr/share/applications
+          mkdir -p ${PKG}/usr/share/pixmaps
+
+          cp triangles-qt ${PKG}/usr/lib/cryptographic-triangles/
+          cp tor-extract/tor/tor ${PKG}/usr/lib/cryptographic-triangles/tor/
+          chmod +x ${PKG}/usr/lib/cryptographic-triangles/tor/tor
+          [ -d tor-extract/data ] && cp -r tor-extract/data ${PKG}/usr/lib/cryptographic-triangles/tor/data
+
+          cat > ${PKG}/usr/bin/cryptographic-triangles << 'LAUNCHER'
+          #!/bin/bash
+          exec /usr/lib/cryptographic-triangles/triangles-qt "$@"
+          LAUNCHER
+          sed -i 's/^          //' ${PKG}/usr/bin/cryptographic-triangles
+          chmod +x ${PKG}/usr/bin/cryptographic-triangles
+
+          cat > ${PKG}/usr/share/applications/cryptographic-triangles.desktop << 'DESKTOP'
+          [Desktop Entry]
+          Name=Cryptographic Triangles
+          Comment=Triangles Cryptocurrency Wallet
+          Exec=cryptographic-triangles
+          Terminal=false
+          Type=Application
+          Icon=cryptographic-triangles
+          Categories=Finance;Network;
+          DESKTOP
+          sed -i 's/^          //' ${PKG}/usr/share/applications/cryptographic-triangles.desktop
+
+          cp src/qt/res/icons/triangles.ico ${PKG}/usr/share/pixmaps/cryptographic-triangles.ico 2>/dev/null || true
+
+          cat > ${PKG}/DEBIAN/control << CTRL
+          Package: cryptographic-triangles
+          Version: ${VERSION}
+          Architecture: amd64
+          Maintainer: Cryptographic Triangles <dev@cryptographic-triangles.org>
+          Description: Cryptographic Triangles wallet with integrated Tor
+           Privacy-focused cryptocurrency wallet with built-in Tor support.
+           Tor is bundled — no additional configuration needed.
+          Depends: libqt5widgets5, libqt5gui5, libqt5network5, libqt5core5a, libboost-system1.74.0 | libboost-system1.83.0, libboost-filesystem1.74.0 | libboost-filesystem1.83.0, libboost-thread1.74.0 | libboost-thread1.83.0, libboost-program-options1.74.0 | libboost-program-options1.83.0, libssl3, libdb5.3++, libevent-2.1-7, libminiupnpc17
+          Section: finance
+          Priority: optional
+          CTRL
+          sed -i 's/^          //' ${PKG}/DEBIAN/control
+
+          dpkg-deb --build ${PKG}
+
+      - name: Upload .deb
        uses: actions/upload-artifact@v4
        with:
-          name: linux-qt
-          path: linux-qt-dist/
+          name: linux-qt-deb
+          path: cryptographic-triangles_*_amd64.deb

  build-linux-daemon:
    runs-on: ubuntu-22.04
@@ -263,22 +301,79 @@ jobs:
      - name: Strip binary
        run: strip --strip-all src/trianglesd

-      - name: Bundle Tor
+      - name: Build .deb package
        run: |
          TOR_VERSION="14.0.8"
          curl -sL "https://archive.torproject.org/tor-package-archive/torbrowser/${TOR_VERSION}/tor-expert-bundle-linux-x86_64-${TOR_VERSION}.tar.gz" -o tor-bundle.tar.gz
          mkdir -p tor-extract && tar -xzf tor-bundle.tar.gz -C tor-extract
-          mkdir -p linux-daemon-dist/tor
-          mv src/trianglesd "linux-daemon-dist/Cryptographic-Triangles-v${VERSION}-linux-x64-daemon"
-          cp tor-extract/tor/tor linux-daemon-dist/tor/
-          chmod +x linux-daemon-dist/tor/tor
-          cp -r tor-extract/data linux-daemon-dist/tor/data

-      - name: Upload artifact
+          PKG="cryptographic-triangles-daemon_${VERSION}_amd64"
+          mkdir -p ${PKG}/DEBIAN
+          mkdir -p ${PKG}/usr/lib/cryptographic-triangles/tor
+          mkdir -p ${PKG}/usr/bin
+          mkdir -p ${PKG}/etc/systemd/system
+
+          cp src/trianglesd ${PKG}/usr/lib/cryptographic-triangles/
+          cp tor-extract/tor/tor ${PKG}/usr/lib/cryptographic-triangles/tor/
+          chmod +x ${PKG}/usr/lib/cryptographic-triangles/tor/tor
+          [ -d tor-extract/data ] && cp -r tor-extract/data ${PKG}/usr/lib/cryptographic-triangles/tor/data
+
+          cat > ${PKG}/usr/bin/trianglesd << 'LAUNCHER'
+          #!/bin/bash
+          exec /usr/lib/cryptographic-triangles/trianglesd "$@"
+          LAUNCHER
+          sed -i 's/^          //' ${PKG}/usr/bin/trianglesd
+          chmod +x ${PKG}/usr/bin/trianglesd
+
+          cat > ${PKG}/etc/systemd/system/trianglesd.service << 'SVC'
+          [Unit]
+          Description=Cryptographic Triangles Daemon
+          After=network-online.target
+          Wants=network-online.target
+
+          [Service]
+          Type=simple
+          ExecStart=/usr/bin/trianglesd
+          Restart=on-failure
+          RestartSec=10
+
+          [Install]
+          WantedBy=multi-user.target
+          SVC
+          sed -i 's/^          //' ${PKG}/etc/systemd/system/trianglesd.service
+
+          cat > ${PKG}/DEBIAN/control << CTRL
+          Package: cryptographic-triangles-daemon
+          Version: ${VERSION}
+          Architecture: amd64
+          Maintainer: Cryptographic Triangles <dev@cryptographic-triangles.org>
+          Description: Cryptographic Triangles daemon with integrated Tor
+           Headless node daemon with built-in Tor support and systemd service.
+           Tor is bundled — no additional configuration needed.
+          Depends: libboost-system1.74.0 | libboost-system1.83.0, libboost-filesystem1.74.0 | libboost-filesystem1.83.0, libboost-thread1.74.0 | libboost-thread1.83.0, libboost-program-options1.74.0 | libboost-program-options1.83.0, libssl3, libdb5.3++, libevent-2.1-7, libminiupnpc17
+          Section: finance
+          Priority: optional
+          CTRL
+          sed -i 's/^          //' ${PKG}/DEBIAN/control
+
+          cat > ${PKG}/DEBIAN/postinst << 'POST'
+          #!/bin/bash
+          systemctl daemon-reload
+          echo ""
+          echo "Cryptographic Triangles daemon installed."
+          echo "  Start:     sudo systemctl start trianglesd"
+          echo "  On boot:   sudo systemctl enable trianglesd"
+          echo ""
+          POST
+          chmod +x ${PKG}/DEBIAN/postinst
+
+          dpkg-deb --build ${PKG}
+
+      - name: Upload .deb
        uses: actions/upload-artifact@v4
        with:
-          name: linux-daemon
-          path: linux-daemon-dist/
+          name: linux-daemon-deb
+          path: cryptographic-triangles-daemon_*_amd64.deb

  build-macos:
    runs-on: macos-15
@@ -341,7 +436,7 @@ jobs:
          mkdir -p Triangles-Qt.app/Contents/MacOS/tor
          cp tor-extract/tor/tor Triangles-Qt.app/Contents/MacOS/tor/
          chmod +x Triangles-Qt.app/Contents/MacOS/tor/tor
-          cp -r tor-extract/data Triangles-Qt.app/Contents/MacOS/tor/data
+          [ -d tor-extract/data ] && cp -r tor-extract/data Triangles-Qt.app/Contents/MacOS/tor/data

      - name: Create DMG
        run: |
@@ -377,15 +472,15 @@ jobs:
      - name: Prepare release assets
        run: |
          mkdir -p release
-          # Windows Qt (zip with Tor bundle included)
-          cd artifacts/windows-qt && zip -r ../../release/Cryptographic-Triangles-${VERSION}-win-x64-qt.zip . && cd ../..
-          # Windows daemon (zip with Tor bundle included)
-          cd artifacts/windows-daemon && zip -r ../../release/Cryptographic-Triangles-${VERSION}-win-x64-daemon.zip . && cd ../..
-          # Linux Qt (tar.gz with Tor bundle)
-          cd artifacts/linux-qt && tar -czf ../../release/Cryptographic-Triangles-${VERSION}-linux-x64-qt.tar.gz . && cd ../..
-          # Linux daemon (tar.gz with Tor bundle)
-          cd artifacts/linux-daemon && tar -czf ../../release/Cryptographic-Triangles-${VERSION}-linux-x64-daemon.tar.gz . && cd ../..
-          # macOS
+          # Windows Qt installer (setup.exe — includes Tor, Start Menu shortcuts, uninstaller)
+          cp artifacts/windows-qt-setup/*.exe release/
+          # Windows daemon (standalone exe for server use)
+          cp artifacts/windows-daemon/trianglesd.exe "release/Cryptographic-Triangles-${VERSION}-win-x64-daemon.exe"
+          # Linux Qt .deb (dpkg -i to install — includes Tor, desktop entry, icon)
+          cp artifacts/linux-qt-deb/*.deb release/
+          # Linux daemon .deb (dpkg -i to install — includes Tor, systemd service)
+          cp artifacts/linux-daemon-deb/*.deb release/
+          # macOS DMG (drag to Applications — Tor inside .app bundle)
          cp artifacts/macos-arm64-dmg/*.dmg release/
          ls -la release/

@@ -0,0 +1,96 @@
+; Cryptographic Triangles NSIS Installer
+; Produces a single setup.exe with wallet + Tor bundled
+
+!include "MUI2.nsh"
+!include "FileFunc.nsh"
+
+!ifndef VERSION
+  !define VERSION "0.0.0"
+!endif
+
+!define APPNAME "Cryptographic Triangles"
+!define COMPANYNAME "Cryptographic Triangles"
+!define EXENAME "triangles-qt.exe"
+
+Name "${APPNAME} v${VERSION}"
+OutFile "Cryptographic-Triangles-${VERSION}-win-x64-setup.exe"
+InstallDir "$PROGRAMFILES64\${APPNAME}"
+InstallDirRegKey HKLM "Software\${APPNAME}" "InstallDir"
+RequestExecutionLevel admin
+
+; UI — icons and bitmaps are relative to THIS .nsi file
+!define MUI_ICON "..\..\src\qt\res\icons\triangles.ico"
+!define MUI_UNICON "..\..\src\qt\res\icons\triangles.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "..\..\share\pixmaps\nsis-header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "..\..\share\pixmaps\nsis-wizard.bmp"
+!define MUI_ABORTWARNING
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${EXENAME}"
+!define MUI_FINISHPAGE_RUN_TEXT "Launch ${APPNAME}"
+
+!insertmacro MUI_PAGE_WELCOME
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_FINISH
+
+!insertmacro MUI_UNPAGE_CONFIRM
+!insertmacro MUI_UNPAGE_INSTFILES
+
+!insertmacro MUI_LANGUAGE "English"
+
+Section "Install"
+  SetOutPath "$INSTDIR"
+
+  ; Wallet + Qt DLLs (prepared by the Package step into dist/)
+  File /r "..\..\dist\*.*"
+
+  ; Tor binary + data (prepared by Download Tor step into tor-files/)
+  SetOutPath "$INSTDIR\tor"
+  File /r "..\..\tor-files\*.*"
+
+  ; Create data directory
+  CreateDirectory "$APPDATA\Triangles"
+
+  ; Uninstaller
+  WriteUninstaller "$INSTDIR\uninstall.exe"
+
+  ; Start menu
+  CreateDirectory "$SMPROGRAMS\${APPNAME}"
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" "" "$INSTDIR\${EXENAME}" 0
+  CreateShortcut "$SMPROGRAMS\${APPNAME}\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+
+  ; Desktop shortcut
+  CreateShortcut "$DESKTOP\${APPNAME}.lnk" "$INSTDIR\${EXENAME}" "" "$INSTDIR\${EXENAME}" 0
+
+  ; Add/Remove Programs
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" '"$INSTDIR\uninstall.exe"'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$INSTDIR\${EXENAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "${COMPANYNAME}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${VERSION}"
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1
+  WriteRegStr HKLM "Software\${APPNAME}" "InstallDir" "$INSTDIR"
+
+  ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
+  IntFmt $0 "0x%08X" $0
+  WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" "$0"
+SectionEnd
+
+Section "Uninstall"
+  ; Stop running processes
+  nsExec::ExecToLog 'taskkill /F /IM triangles-qt.exe'
+  nsExec::ExecToLog 'taskkill /F /IM trianglesd.exe'
+  nsExec::ExecToLog 'taskkill /F /IM tor.exe'
+
+  ; Remove installation
+  RMDir /r "$INSTDIR"
+
+  ; Remove shortcuts
+  RMDir /r "$SMPROGRAMS\${APPNAME}"
+  Delete "$DESKTOP\${APPNAME}.lnk"
+
+  ; Remove registry
+  DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}"
+  DeleteRegKey HKLM "Software\${APPNAME}"
+SectionEnd