diff --git a/.gitignore b/.gitignore index 2bb560f..5930142 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ db4/ osx_volname dist/ *.background.tiff +GEMINI.md diff --git a/assets/logos/palladium.ico b/assets/logos/palladium.ico new file mode 100644 index 0000000..be681e5 Binary files /dev/null and b/assets/logos/palladium.ico differ diff --git a/assets/logos/palladium.png b/assets/logos/palladium.png new file mode 100644 index 0000000..6fd7b64 Binary files /dev/null and b/assets/logos/palladium.png differ diff --git a/assets/logos/palladium.svg b/assets/logos/palladium.svg new file mode 100644 index 0000000..aab3609 --- /dev/null +++ b/assets/logos/palladium.svg @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/logos/palladium1024.jpg b/assets/logos/palladium1024.jpg deleted file mode 100644 index 1263648..0000000 Binary files a/assets/logos/palladium1024.jpg and /dev/null differ diff --git a/assets/logos/palladium1024.png b/assets/logos/palladium1024.png new file mode 100644 index 0000000..e58f076 Binary files /dev/null and b/assets/logos/palladium1024.png differ diff --git a/assets/logos/palladium128.png b/assets/logos/palladium128.png new file mode 100644 index 0000000..1adba1f Binary files /dev/null and b/assets/logos/palladium128.png differ diff --git a/assets/logos/palladium16.png b/assets/logos/palladium16.png new file mode 100644 index 0000000..8d3b2d2 Binary files /dev/null and b/assets/logos/palladium16.png differ diff --git a/assets/logos/palladium250.png b/assets/logos/palladium250.png index e685f3b..bf2cb29 100644 Binary files a/assets/logos/palladium250.png and b/assets/logos/palladium250.png differ diff --git a/assets/logos/palladium32.png b/assets/logos/palladium32.png index 71c76bb..218d3e8 100644 Binary files a/assets/logos/palladium32.png and b/assets/logos/palladium32.png differ diff --git a/assets/logos/palladium500.png b/assets/logos/palladium500.png new file mode 100644 index 0000000..eed9671 Binary files /dev/null and b/assets/logos/palladium500.png differ diff --git a/assets/logos/palladium64.png b/assets/logos/palladium64.png new file mode 100644 index 0000000..ab00b6a Binary files /dev/null and b/assets/logos/palladium64.png differ diff --git a/assets/logos/palladium_logo1024.jpg b/assets/logos/palladium_logo1024.jpg new file mode 100644 index 0000000..c5e7725 Binary files /dev/null and b/assets/logos/palladium_logo1024.jpg differ diff --git a/assets/logos/palladium_nb500.png b/assets/logos/palladium_nb500.png new file mode 100644 index 0000000..977861c Binary files /dev/null and b/assets/logos/palladium_nb500.png differ diff --git a/assets/logos/palladium_testnet.ico b/assets/logos/palladium_testnet.ico new file mode 100644 index 0000000..be681e5 Binary files /dev/null and b/assets/logos/palladium_testnet.ico differ diff --git a/assets/logos/plmc500.png b/assets/logos/plmc500.png new file mode 100644 index 0000000..f1bb94e Binary files /dev/null and b/assets/logos/plmc500.png differ diff --git a/docker-build/README.md b/docker-build/README.md index e742534..02cc55c 100644 --- a/docker-build/README.md +++ b/docker-build/README.md @@ -79,7 +79,7 @@ cd docker-build # Navigate to the docker-build directory ### Output -Binaries will be available in `../build/armv7l/`: +Binaries will be available in `../build/linux-armv7l/`: - `palladiumd` - Main daemon - `palladium-cli` - Command-line client - `palladium-tx` - Transaction utility diff --git a/docker-build/build-linux-aarch64.sh b/docker-build/build-linux-aarch64.sh index 90d7b95..39c51dd 100755 --- a/docker-build/build-linux-aarch64.sh +++ b/docker-build/build-linux-aarch64.sh @@ -4,7 +4,7 @@ set -euo pipefail IMAGE_NAME="palladium-builder:linux-aarch64-ubuntu20.04" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" -OUT_DIR="${REPO_DIR}/build/aarch64" +OUT_DIR="${REPO_DIR}/build/linux-aarch64" HOST_TRIPLE="aarch64-linux-gnu" HOST_UID="$(id -u)" diff --git a/docker-build/build-linux-armv7l.sh b/docker-build/build-linux-armv7l.sh index 8e3700d..ebc2e76 100755 --- a/docker-build/build-linux-armv7l.sh +++ b/docker-build/build-linux-armv7l.sh @@ -4,7 +4,7 @@ set -euo pipefail IMAGE_NAME="palladium-builder:linux-armv7l-ubuntu20.04" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" -OUT_DIR="${REPO_DIR}/build/armv7l" +OUT_DIR="${REPO_DIR}/build/linux-armv7l" HOST_TRIPLE="arm-linux-gnueabihf" HOST_UID="$(id -u)" diff --git a/docker-build/build-menu.sh b/docker-build/build-menu.sh index 2cabeb2..0456f0b 100755 --- a/docker-build/build-menu.sh +++ b/docker-build/build-menu.sh @@ -8,16 +8,17 @@ SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" run_build() { local script_name="$1" local description="$2" + shift 2 echo "============================================================" echo "Starting build for: $description" - echo "Script: $script_name" + echo "Script: $script_name $*" echo "============================================================" if [[ -f "${SCRIPT_DIR}/${script_name}" ]]; then # Ensure it's executable chmod +x "${SCRIPT_DIR}/${script_name}" - "${SCRIPT_DIR}/${script_name}" + "${SCRIPT_DIR}/${script_name}" "$@" else echo "Error: Script ${script_name} not found!" fi @@ -35,24 +36,31 @@ show_menu() { echo "2) Linux aarch64 (ARM64)" echo "3) Linux armv7l (ARM 32-bit)" echo "4) Windows x86_64" - echo "5) Build ALL" + echo "4a) Windows x86_64 (Installer)" + echo "5) Build ALL (Binaries and Installers)" + echo "6) Build ALL Installers" echo "0) Exit" echo "" } show_menu -read -p "Enter your choice(s) separated by space (e.g. '1 4' for Linux and Windows): " choices +read -p "Enter your choice(s) separated by space (e.g. '1 4a' for Linux and Windows Installer): " choices # Convert string to array read -ra ADDR <<< "$choices" -# Check if '5' (ALL) is selected +# Check if '5' (ALL) or '6' is selected do_all=false +do_all_installers=false for choice in "${ADDR[@]}"; do if [[ "$choice" == "5" ]]; then do_all=true break fi + if [[ "$choice" == "6" ]]; then + do_all_installers=true + break + fi done if [ "$do_all" = true ]; then @@ -60,6 +68,9 @@ if [ "$do_all" = true ]; then run_build "build-linux-aarch64.sh" "Linux aarch64" run_build "build-linux-armv7l.sh" "Linux armv7l" run_build "build-windows.sh" "Windows x86_64" + run_build "build-windows.sh" "Windows x86_64 (Installer)" --installer +elif [ "$do_all_installers" = true ]; then + run_build "build-windows.sh" "Windows x86_64 (Installer)" --installer else for choice in "${ADDR[@]}"; do case "$choice" in @@ -75,6 +86,9 @@ else 4) run_build "build-windows.sh" "Windows x86_64" ;; + "4a") + run_build "build-windows.sh" "Windows x86_64 (Installer)" --installer + ;; 0) echo "Exiting." exit 0 diff --git a/docker-build/build-windows.sh b/docker-build/build-windows.sh index 638ba92..30e9fda 100755 --- a/docker-build/build-windows.sh +++ b/docker-build/build-windows.sh @@ -1,6 +1,15 @@ #!/usr/bin/env bash set -euo pipefail +# Default to not building the installer +BUILD_INSTALLER=false + +# Check for --installer flag +if [[ "$1" == "--installer" ]]; then + BUILD_INSTALLER=true + echo "[*] Installer build requested." +fi + IMAGE_NAME="palladium-builder:windows-ubuntu20.04" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" REPO_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)" @@ -23,6 +32,7 @@ echo "[*] Starting container: build COMPLETELY in container; mount ONLY the outp docker run --rm --platform=linux/amd64 \ -e HOST_UID="${HOST_UID}" -e HOST_GID="${HOST_GID}" \ -v "${OUT_DIR}":/out \ + -e BUILD_INSTALLER="${BUILD_INSTALLER}" \ "$IMAGE_NAME" \ bash -c " set -euo pipefail @@ -54,6 +64,13 @@ docker run --rm --platform=linux/amd64 \ [[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/ done + if [[ "\$BUILD_INSTALLER" == "true" ]]; then + echo '[*] make deploy (creating installer)...' + make deploy + echo '[*] copying installer to /out...' + find . -iname 'palladium-*-win64-setup.exe' -print -exec install -m 0644 {} /out/ \; + fi + # Align permissions to host user chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out diff --git a/src/qt/res/icons/palladium.ico b/src/qt/res/icons/palladium.ico index 401cd7f..be681e5 100644 Binary files a/src/qt/res/icons/palladium.ico and b/src/qt/res/icons/palladium.ico differ diff --git a/src/qt/res/icons/palladium.png b/src/qt/res/icons/palladium.png index 2b5c7f9..6fd7b64 100644 Binary files a/src/qt/res/icons/palladium.png and b/src/qt/res/icons/palladium.png differ diff --git a/src/qt/res/icons/palladium_testnet.ico b/src/qt/res/icons/palladium_testnet.ico index 401cd7f..be681e5 100644 Binary files a/src/qt/res/icons/palladium_testnet.ico and b/src/qt/res/icons/palladium_testnet.ico differ diff --git a/src/qt/res/src/palladium.svg b/src/qt/res/src/palladium.svg index 6d9e05a..aab3609 100644 --- a/src/qt/res/src/palladium.svg +++ b/src/qt/res/src/palladium.svg @@ -1,58 +1,150 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +