corregit makefile de macos
This commit is contained in:
@@ -5,7 +5,13 @@
|
|||||||
"Bash(make:*)",
|
"Bash(make:*)",
|
||||||
"Bash(echo:*)",
|
"Bash(echo:*)",
|
||||||
"Bash(objdump:*)",
|
"Bash(objdump:*)",
|
||||||
"Bash(unzip:*)"
|
"Bash(unzip:*)",
|
||||||
|
"Bash(\"/Volumes/diskito/diskito.app/Contents/MacOS/diskito\")",
|
||||||
|
"Bash(pkill:*)",
|
||||||
|
"Bash(hdiutil detach:*)",
|
||||||
|
"Bash(cat:*)",
|
||||||
|
"Bash(hdiutil mount:*)",
|
||||||
|
"Bash(open \"/Volumes/Orni Attack/Orni Attack.app\")"
|
||||||
],
|
],
|
||||||
"deny": [],
|
"deny": [],
|
||||||
"ask": []
|
"ask": []
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
# CMakeLists.txt
|
# CMakeLists.txt
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.10)
|
||||||
project(diskito VERSION 0.7.1)
|
project(orni VERSION 0.7.1)
|
||||||
|
|
||||||
# Info del proyecto
|
# Info del proyecto
|
||||||
set(PROJECT_LONG_NAME "diskito")
|
set(PROJECT_LONG_NAME "Orni Attack")
|
||||||
set(PROJECT_COPYRIGHT_ORIGINAL "© 1999 Visente i Sergi")
|
set(PROJECT_COPYRIGHT_ORIGINAL "© 1999 Visente i Sergi")
|
||||||
set(PROJECT_COPYRIGHT_PORT "© 2025 JailDesigner")
|
set(PROJECT_COPYRIGHT_PORT "© 2025 JailDesigner")
|
||||||
set(PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT_ORIGINAL}, ${PROJECT_COPYRIGHT_PORT}")
|
set(PROJECT_COPYRIGHT "${PROJECT_COPYRIGHT_ORIGINAL}, ${PROJECT_COPYRIGHT_PORT}")
|
||||||
|
|||||||
30
Makefile
30
Makefile
@@ -20,7 +20,16 @@ TARGET_FILE := $(DIR_BIN)$(TARGET_NAME)
|
|||||||
RELEASE_FOLDER := $(TARGET_NAME)_release
|
RELEASE_FOLDER := $(TARGET_NAME)_release
|
||||||
RELEASE_FILE := $(RELEASE_FOLDER)/$(TARGET_NAME)
|
RELEASE_FILE := $(RELEASE_FOLDER)/$(TARGET_NAME)
|
||||||
|
|
||||||
# Release file names
|
# ==============================================================================
|
||||||
|
# VERSION
|
||||||
|
# ==============================================================================
|
||||||
|
ifeq ($(OS),Windows_NT)
|
||||||
|
VERSION := v$(shell powershell -Command "(Select-String -Path 'CMakeLists.txt' -Pattern 'project.*VERSION\s+([0-9.]+)').Matches.Groups[1].Value")
|
||||||
|
else
|
||||||
|
VERSION := v$(shell grep "^project" CMakeLists.txt | tr -cd 0-9.)
|
||||||
|
endif
|
||||||
|
|
||||||
|
# Release file names (depend on VERSION, so must come after)
|
||||||
ifeq ($(OS),Windows_NT)
|
ifeq ($(OS),Windows_NT)
|
||||||
RAW_VERSION := $(shell powershell -Command "\"$(VERSION)\" -replace '^v', ''")
|
RAW_VERSION := $(shell powershell -Command "\"$(VERSION)\" -replace '^v', ''")
|
||||||
else
|
else
|
||||||
@@ -33,15 +42,6 @@ LINUX_RELEASE := $(TARGET_NAME)-$(VERSION)-linux-x64.tar.gz
|
|||||||
RPI_RELEASE := $(TARGET_NAME)-$(VERSION)-rpi-arm64.tar.gz
|
RPI_RELEASE := $(TARGET_NAME)-$(VERSION)-rpi-arm64.tar.gz
|
||||||
APP_NAME := $(LONG_NAME)
|
APP_NAME := $(LONG_NAME)
|
||||||
|
|
||||||
# ==============================================================================
|
|
||||||
# VERSION
|
|
||||||
# ==============================================================================
|
|
||||||
ifeq ($(OS),Windows_NT)
|
|
||||||
VERSION := v$(shell powershell -Command "(Select-String -Path 'CMakeLists.txt' -Pattern 'project.*VERSION\s+([0-9.]+)').Matches.Groups[1].Value")
|
|
||||||
else
|
|
||||||
VERSION := v$(shell grep "^project" CMakeLists.txt | tr -cd 0-9.)
|
|
||||||
endif
|
|
||||||
|
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# SOURCE FILES
|
# SOURCE FILES
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
@@ -151,12 +151,18 @@ macos_release: pack_tool resources.pack
|
|||||||
@cp LICENSE "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: LICENSE not found"
|
@cp LICENSE "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: LICENSE not found"
|
||||||
@cp README.md "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: README.md not found"
|
@cp README.md "$(RELEASE_FOLDER)/" 2>/dev/null || echo "Warning: README.md not found"
|
||||||
|
|
||||||
# Update Info.plist version
|
# Update Info.plist version and names
|
||||||
@echo "Updating Info.plist with version $(RAW_VERSION)..."
|
@echo "Updating Info.plist with version $(RAW_VERSION) and names..."
|
||||||
@sed -i '' '/<key>CFBundleShortVersionString<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
|
@sed -i '' '/<key>CFBundleShortVersionString<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
|
||||||
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
||||||
@sed -i '' '/<key>CFBundleVersion<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
|
@sed -i '' '/<key>CFBundleVersion<\/key>/{n;s|<string>.*</string>|<string>$(RAW_VERSION)</string>|;}' \
|
||||||
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
||||||
|
@sed -i '' '/<key>CFBundleExecutable<\/key>/{n;s|<string>.*</string>|<string>$(TARGET_NAME)</string>|;}' \
|
||||||
|
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
||||||
|
@sed -i '' '/<key>CFBundleName<\/key>/{n;s|<string>.*</string>|<string>$(APP_NAME)</string>|;}' \
|
||||||
|
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
||||||
|
@sed -i '' '/<key>CFBundleDisplayName<\/key>/{n;s|<string>.*</string>|<string>$(APP_NAME)</string>|;}' \
|
||||||
|
"$(RELEASE_FOLDER)/$(APP_NAME).app/Contents/Info.plist"
|
||||||
|
|
||||||
# Compile for Apple Silicon using CMake
|
# Compile for Apple Silicon using CMake
|
||||||
@cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64
|
@cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=arm64
|
||||||
|
|||||||
Reference in New Issue
Block a user