Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Kenny/feat depends #8

Merged
merged 2 commits into from
Dec 28, 2024
Merged

Kenny/feat depends #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d954fb4
corrected binary name
kennethdsheridan Dec 27, 2024
bbfd484
corrected build
kennethdsheridan Dec 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,5 @@ name = "hardware_report" # Optional, defaults to the package name
path = "src/lib.rs" # Path to the library file

[[bin]]
name = "hardware_report_binary" # Name of the binary
path = "src/bin/hardware_report.rs" # Path to the binary's main.rs
name = "hardware_report" # Name of the binary
path = "src/bin/hardware_report.rs" # Path to the binary's main.rs
115 changes: 67 additions & 48 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Makefile for hardware_report - System Hardware Information Tool

# Define the name of the binary
# Define the name of the binary (must match your [[bin]] name in Cargo.toml)
BINARY_NAME := hardware_report

# Define the Rust compiler and Cargo
Expand Down Expand Up @@ -31,86 +31,107 @@ DOCKER_IMAGE := rust:latest
UNAME_S := $(shell uname -s)
UNAME_M := $(shell uname -m)

# Check if Docker is available
DOCKER_AVAILABLE := $(shell command -v docker 2> /dev/null)
# Check if Docker is installed (non-empty if found)
DOCKER_CMD := $(shell command -v docker 2> /dev/null)

# Default target
# Check if Docker is running (if installed). We'll store '1' if running, '0' otherwise
DOCKER_RUNNING := $(shell if [ -n "$(DOCKER_CMD)" ]; then docker info >/dev/null 2>&1 && echo 1 || echo 0; else echo 0; fi)

# Default target: build for both Linux and macOS on whichever platform we are on
.PHONY: all
all:
all:
ifeq ($(UNAME_S),Darwin)
ifeq ($(DOCKER_AVAILABLE),)
@echo "Docker is not available. Skipping Linux build and proceeding with macOS build only."
@$(MAKE) macos
else
@$(MAKE) linux macos
endif
else
else ifeq ($(UNAME_S),Linux)
@$(MAKE) linux macos
else
@echo "Unsupported operating system: $(UNAME_S)"
@exit 1
endif

# Target for building Linux x86_64 binary
.PHONY: linux
linux:
linux: install-tools
@echo "Building for Linux (x86_64)..."
@mkdir -p $(RELEASE_DIR)
ifeq ($(UNAME_S),Linux)
@echo "Building natively on Linux..."
$(CARGO_BUILD) --target=$(LINUX_TARGET)
@cp target/$(LINUX_TARGET)/release/$(BINARY_NAME) $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64
else
ifeq ($(DOCKER_AVAILABLE),)
@echo "Error: Docker is not available. Cannot build for Linux on non-Linux systems without Docker."
@exit 1
else

ifeq ($(UNAME_S),Darwin)
# On macOS → only cross-compile with Docker if Docker is running
ifeq ($(DOCKER_RUNNING),1)
@echo "Cross-compiling for Linux using Docker..."
@docker run --rm -v $(PWD):/usr/src/myapp -w /usr/src/myapp --platform linux/amd64 $(DOCKER_IMAGE) \
docker run --rm \
-v "$(PWD)":/usr/src/myapp \
-w /usr/src/myapp \
--platform linux/amd64 \
$(DOCKER_IMAGE) \
bash -c "rustup target add $(LINUX_TARGET) && \
cargo build --release --target=$(LINUX_TARGET)"
@cp target/$(LINUX_TARGET)/release/$(BINARY_NAME) $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64
cargo build --release --target=$(LINUX_TARGET)"
@cp target/$(LINUX_TARGET)/release/$(BINARY_NAME) \
$(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64
@chmod +x $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64
@echo "Linux binary built (docker cross-compile): $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64"
else
@echo "WARNING: Docker is not running or not available on macOS. Skipping Linux build."
endif

else ifeq ($(UNAME_S),Linux)
# On Linux → build natively, no Docker
$(CARGO_BUILD) --target=$(LINUX_TARGET)
@cp target/$(LINUX_TARGET)/release/$(BINARY_NAME) \
$(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64
@echo "Linux binary built (native): $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64"
else
@echo "Unsupported operating system for Linux build: $(UNAME_S)"
@exit 1
endif
@echo "Linux binary built: $(RELEASE_DIR)/$(BINARY_NAME)-linux-x86_64"


# Target for building macOS binary
.PHONY: macos
macos:
macos: install-tools
ifeq ($(UNAME_S),Darwin)
@echo "Building for macOS ($(UNAME_M))..."
@mkdir -p $(RELEASE_DIR)
ifeq ($(UNAME_M),arm64) # If on Apple Silicon
$(CARGO_BUILD) --target=aarch64-apple-darwin
@cp target/$(MACOS_TARGET)/release/$(BINARY_NAME) $(RELEASE_DIR)/$(BINARY_NAME)-macos-arm64
else ifeq ($(UNAME_M),x86_64) # If on Intel Mac
ifeq ($(UNAME_M),arm64)
# Apple Silicon
$(CARGO_BUILD) --target=$(MACOS_TARGET)
@cp target/$(MACOS_TARGET)/release/$(BINARY_NAME) \
$(RELEASE_DIR)/$(BINARY_NAME)-macos-arm64
@echo "macOS binary built: $(RELEASE_DIR)/$(BINARY_NAME)-macos-arm64"
else ifeq ($(UNAME_M),x86_64)
# Intel Mac
$(CARGO_BUILD) --target=x86_64-apple-darwin
@cp target/x86_64-apple-darwin/release/$(BINARY_NAME) $(RELEASE_DIR)/$(BINARY_NAME)-macos-x86_64
@cp target/x86_64-apple-darwin/release/$(BINARY_NAME) \
$(RELEASE_DIR)/$(BINARY_NAME)-macos-x86_64
@echo "macOS binary built: $(RELEASE_DIR)/$(BINARY_NAME)-macos-x86_64"
else
@echo "Unknown Mac architecture: $(UNAME_M)."
endif
@echo "macOS binary built: $(RELEASE_DIR)/$(BINARY_NAME)-macos-$(UNAME_M)"
else
@echo "Error: macOS build can only be performed on a Mac."
@exit 1
@echo "Skipping macOS build because we're not on macOS."
endif

# Target for installing required tools
.PHONY: install-tools
install-tools:
@echo "Installing required tools..."
rustup target add $(LINUX_TARGET)

ifeq ($(UNAME_S),Darwin)
rustup target add $(MACOS_TARGET)
ifeq ($(UNAME_M),x86_64)
@echo "Note: For cross-compilation to ARM64, additional setup may be required."
endif
ifeq ($(DOCKER_AVAILABLE),)
@echo "Warning: Docker is not installed. It is required for building Linux binaries on macOS."

# Only pull Docker image if Docker is installed & running
ifeq ($(DOCKER_RUNNING),1)
@echo "Docker is running on macOS...pulling image for cross-builds."
docker pull --platform linux/amd64 $(DOCKER_IMAGE) || true
else
@echo "Docker is available for Linux builds."
docker pull --platform linux/amd64 $(DOCKER_IMAGE)
@echo "Docker not running (or not installed). Will skip Docker-based Linux builds."
endif

else ifeq ($(UNAME_S),Linux)
@echo "Building on Linux, no additional tools needed."
@echo "Building on Linux natively. No Docker usage needed."
else
@echo "Unsupported operating system"
@echo "Unsupported operating system: $(UNAME_S)"
@exit 1
endif

Expand Down Expand Up @@ -144,9 +165,9 @@ clean:
.PHONY: help
help:
@echo "Available targets:"
@echo " all - Build for all platforms (default)"
@echo " linux - Build for Linux x86_64"
@echo " macos - Build for macOS (native architecture)"
@echo " all - Build for both Linux and macOS on your current platform"
@echo " linux - Build for Linux x86_64 (Docker on macOS if running, native on Linux)"
@echo " macos - Build for macOS (only works on an actual Mac)"
@echo " test - Run tests"
@echo " fmt - Check code format"
@echo " lint - Run clippy linter"
Expand All @@ -155,5 +176,3 @@ help:
@echo " install-tools- Install required build tools"
@echo " help - Show this help message"

# Ensure all required tools are installed before building
linux macos: install-tools
Loading