Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Reduces the Makefiles to the absolutely necessary commands.
- Removes any dependency on GPGTools_Core - Cleans up the Makefiles
- Loading branch information
Showing
3 changed files
with
69 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,14 @@ | ||
| PROJECT = GPGPreferences | ||
| TARGET = GPGPreferences | ||
| PRODUCT = GPGPreferences | ||
| MAKE_DEFAULT = Dependencies/GPGTools_Core/newBuildSystem/Makefile.default | ||
| VPATH = build/$(CONFIG)/GPGPreferences.prefPane/Contents/MacOS | ||
| NEED_LIBMACGPG = 1 | ||
|
|
||
|
|
||
| -include $(MAKE_DEFAULT) | ||
|
|
||
| .PRECIOUS: $(MAKE_DEFAULT) | ||
| $(MAKE_DEFAULT): | ||
| @echo "Dependencies/GPGTools_Core is missing.\nPlease clone it manually from https://github.com/GPGTools/GPGTools_Core\n" | ||
| @exit 1 | ||
|
|
||
| init: $(MAKE_DEFAULT) | ||
|
|
||
|
|
||
| $(PRODUCT): Source/* Resources/* Resources/*/* GPGPreferences.xcodeproj | ||
| @xcodebuild -project $(PROJECT).xcodeproj -target $(TARGET) -configuration $(CONFIG) build $(XCCONFIG) | ||
|
|
||
| install: $(PRODUCT) | ||
| @echo "Installing GPGPreferences into $(INSTALL_ROOT)Library/PreferencePanes" | ||
| @mkdir -p "$(INSTALL_ROOT)Library/PreferencePanes" | ||
| @rsync -rltDE "build/$(CONFIG)/GPGPreferences.prefPane" "$(INSTALL_ROOT)Library/PreferencePanes" | ||
| @echo Done | ||
| @echo "In order to use GPGPreferences, please don't forget to install MacGPG2 and Libmacgpg." | ||
|
|
||
|
|
||
|
|
||
| PRODUCT = GPGPreferences.prefPane/MacOS/GPGPreferences | ||
| VPATH = build/Release | ||
| LIBMACGPG_BUILD_PATH = ./Dependencies/Libmacgpg/build | ||
| all: $(PRODUCT) | ||
|
|
||
| $(PRODUCT): Source/* Resources/* Resources/*/* $(PROJECT).xcodeproj | ||
| @xcodebuild -project $(PROJECT).xcodeproj -target $(TARGET) build $(XCCONFIG) | ||
|
|
||
| clean: | ||
| rm -rf "./build" | ||
| # Cleanup Libmacgpg if necessary. | ||
| @test -d "$(LIBMACGPG_BUILD_PATH)" && rm -rvf "$(LIBMACGPG_BUILD_PATH)" || exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,7 @@ | ||
| name="GPGPreferences" | ||
| appName="GPGPreferences.prefPane" | ||
|
|
||
| rmName="Uninstall.app" | ||
| imgBackground="Installer/background_dmg.png"; | ||
| volumeLayout="Installer/DS_Store" | ||
|
|
||
|
|
||
|
|
||
| unset REVISION PRERELEASE | ||
| #PRERELEASE=b8 | ||
|
|
||
| MAJOR=1 | ||
| MINOR=5 | ||
| PRERELEASE=b5 | ||
|
|
||
| source "$(dirname "${BASH_SOURCE[0]}")/Dependencies/GPGTools_Core/newBuildSystem/versioning.sh" | ||
| COMMIT_HASH=$(git rev-parse --short HEAD)$(test -z "$(git status --porcelain)" || echo "+") | ||
| VERSION="${MAJOR}.${MINOR}${REVISION:+.$REVISION}${PRERELEASE} ($COMMIT_HASH)" | ||
| BUILD_VERSION=0n |