diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-25 23:04:48 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2019-10-26 00:17:23 +0200 |
| commit | 0e4ab56e12439dcceb4f7ba6384cc6404c1de11b (patch) | |
| tree | 2a7958478c4c95952b23c612a4ca6eb1a2cdb8a9 /src | |
| parent | 0ca62a37d66c52042fc8565bd2538d7f19f92e66 (diff) | |
| download | VeraCrypt-0e4ab56e12439dcceb4f7ba6384cc6404c1de11b.tar.gz VeraCrypt-0e4ab56e12439dcceb4f7ba6384cc6404c1de11b.zip | |
MacOSX: Update build script and Makefile to correctly build Legacy version of VeraCrypt that targets OSX 10.7+.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/Main/Main.make | 10 | ||||
| -rwxr-xr-x | src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 103 |
2 files changed, 91 insertions, 22 deletions
diff --git a/src/Main/Main.make b/src/Main/Main.make index 9bf5b025..a154a846 100755 --- a/src/Main/Main.make +++ b/src/Main/Main.make @@ -221,9 +221,15 @@ install: prepare cp -R $(APPNAME).app /Applications/. package: prepare +ifdef VC_LEGACY_BUILD + /usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt_Legacy.pkgproj + productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt Legacy $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg + rm -f $(APPNAME)_Legacy_$(TC_VERSION).dmg +else /usr/local/bin/packagesbuild $(BASE_DIR)/Setup/MacOSX/veracrypt.pkgproj productsign --sign "Developer ID Installer: IDRIX (Z933746L2S)" --timestamp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt $(TC_VERSION).pkg" $(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg rm -f $(APPNAME)_$(TC_VERSION).dmg +endif rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" mkdir -p "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" @@ -231,7 +237,11 @@ package: prepare hdiutil attach "$(BASE_DIR)/Setup/MacOSX/template.dmg" -noautoopen -quiet -mountpoint "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" cp "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_$(TC_VERSION).pkg" "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg/VeraCrypt_Installer.pkg" hdiutil detach "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" -quiet -force +ifdef VC_LEGACY_BUILD + hdiutil convert "$(BASE_DIR)/Setup/MacOSX/template.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o $(APPNAME)_Legacy_$(TC_VERSION).dmg +else hdiutil convert "$(BASE_DIR)/Setup/MacOSX/template.dmg" -quiet -format UDZO -imagekey zlib-level=9 -o $(APPNAME)_$(TC_VERSION).dmg +endif rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" endif diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index 3de38f56..bbfa7ce7 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -5,6 +5,10 @@ <key>PACKAGES</key> <array> <dict> + <key>MUST-CLOSE-APPLICATION-ITEMS</key> + <array/> + <key>MUST-CLOSE-APPLICATIONS</key> + <false/> <key>PACKAGE_FILES</key> <dict> <key>DEFAULT_INSTALL_LOCATION</key> @@ -253,7 +257,7 @@ <key>PATH_TYPE</key> <integer>0</integer> <key>PERMISSIONS</key> - <integer>493</integer> + <integer>1005</integer> <key>TYPE</key> <integer>1</integer> <key>UID</key> @@ -355,6 +359,38 @@ <key>UID</key> <integer>0</integer> </dict> + <dict> + <key>CHILDREN</key> + <array/> + <key>GID</key> + <integer>0</integer> + <key>PATH</key> + <string>Automator</string> + <key>PATH_TYPE</key> + <integer>0</integer> + <key>PERMISSIONS</key> + <integer>493</integer> + <key>TYPE</key> + <integer>1</integer> + <key>UID</key> + <integer>0</integer> + </dict> + <dict> + <key>CHILDREN</key> + <array/> + <key>GID</key> + <integer>0</integer> + <key>PATH</key> + <string>Extensions</string> + <key>PATH_TYPE</key> + <integer>0</integer> + <key>PERMISSIONS</key> + <integer>493</integer> + <key>TYPE</key> + <integer>1</integer> + <key>UID</key> + <integer>0</integer> + </dict> </array> <key>GID</key> <integer>0</integer> @@ -468,15 +504,29 @@ </dict> <key>PAYLOAD_TYPE</key> <integer>0</integer> + <key>PRESERVE_EXTENDED_ATTRIBUTES</key> + <false/> + <key>SHOW_INVISIBLE</key> + <false/> + <key>SPLIT_FORKS</key> + <true/> + <key>TREAT_MISSING_FILES_AS_WARNING</key> + <false/> <key>VERSION</key> - <integer>2</integer> + <integer>5</integer> </dict> <key>PACKAGE_SCRIPTS</key> <dict> <key>POSTINSTALL_PATH</key> - <dict/> + <dict> + <key>PATH_TYPE</key> + <integer>0</integer> + </dict> <key>PREINSTALL_PATH</key> - <dict/> + <dict> + <key>PATH_TYPE</key> + <integer>0</integer> + </dict> <key>RESOURCES</key> <array/> </dict> @@ -486,6 +536,8 @@ <integer>1</integer> <key>CONCLUSION_ACTION</key> <integer>0</integer> + <key>FOLLOW_SYMBOLIC_LINKS</key> + <false/> <key>IDENTIFIER</key> <string>com.idrix.pkg.veracrypt</string> <key>LOCATION</key> @@ -494,9 +546,19 @@ <string>veracrypt</string> <key>OVERWRITE_PERMISSIONS</key> <false/> + <key>PAYLOAD_SIZE</key> + <integer>-1</integer> + <key>REFERENCE_PATH</key> + <string></string> + <key>RELOCATABLE</key> + <false/> + <key>USE_HFS+_COMPRESSION</key> + <false/> <key>VERSION</key> <string>1.24.7</string> </dict> + <key>TYPE</key> + <integer>0</integer> <key>UUID</key> <string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string> </dict> @@ -524,14 +586,15 @@ <dict> <key>BACKGROUND</key> <dict> - <key>ALIGNMENT</key> - <integer>4</integer> - <key>BACKGROUND_PATH</key> - <dict/> - <key>CUSTOM</key> - <false/> - <key>SCALING</key> - <integer>0</integer> + <key>APPAREANCES</key> + <dict> + <key>DARK_AQUA</key> + <dict/> + <key>LIGHT_AQUA</key> + <dict/> + </dict> + <key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key> + <true/> </dict> <key>INSTALLATION TYPE</key> <dict> @@ -567,7 +630,7 @@ <dict/> </dict> </dict> - <key>INSTALLATION TYPE</key> + <key>MODE</key> <integer>0</integer> </dict> <key>INSTALLATION_STEPS</key> @@ -636,8 +699,6 @@ </dict> <key>LICENSE</key> <dict> - <key>KEYWORDS</key> - <dict/> <key>LOCALIZATIONS</key> <array> <dict> @@ -813,10 +874,6 @@ https://osxfuse.github.io/ <true/> </dict> </array> - <key>POSTINSTALL_PATH</key> - <dict/> - <key>PREINSTALL_PATH</key> - <dict/> <key>RESOURCES</key> <array/> <key>ROOT_VOLUME_ONLY</key> @@ -824,8 +881,6 @@ https://osxfuse.github.io/ </dict> <key>PROJECT_SETTINGS</key> <dict> - <key>ADVANCED_OPTIONS</key> - <dict/> <key>BUILD_FORMAT</key> <integer>0</integer> <key>BUILD_PATH</key> @@ -1004,7 +1059,11 @@ https://osxfuse.github.io/ </dict> </array> <key>NAME</key> - <string>VeraCrypt 1.24-Hotfix1</string> + <string>VeraCrypt Legacy 1.24-Hotfix1</string> + <key>PAYLOAD_ONLY</key> + <false/> + <key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key> + <false/> </dict> </dict> <key>SHARED_GLOBAL_DATA</key> |