MacOSX: Update build script and Makefile to correctly build Legacy version of VeraCrypt that targets OSX 10.7+.

This commit is contained in:
Mounir IDRASSI 2019-10-25 23:04:48 +02:00
parent 0ca62a37d6
commit 0e4ab56e12
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
2 changed files with 91 additions and 22 deletions

View File

@ -221,9 +221,15 @@ install: prepare
cp -R $(APPNAME).app /Applications/. cp -R $(APPNAME).app /Applications/.
package: prepare 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 /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 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 rm -f $(APPNAME)_$(TC_VERSION).dmg
endif
rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg" rm -f "$(BASE_DIR)/Setup/MacOSX/template.dmg"
rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
mkdir -p "$(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" 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" 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 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 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 -f "$(BASE_DIR)/Setup/MacOSX/template.dmg"
rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg" rm -fr "$(BASE_DIR)/Setup/MacOSX/VeraCrypt_dmg"
endif endif

View File

@ -5,6 +5,10 @@
<key>PACKAGES</key> <key>PACKAGES</key>
<array> <array>
<dict> <dict>
<key>MUST-CLOSE-APPLICATION-ITEMS</key>
<array/>
<key>MUST-CLOSE-APPLICATIONS</key>
<false/>
<key>PACKAGE_FILES</key> <key>PACKAGE_FILES</key>
<dict> <dict>
<key>DEFAULT_INSTALL_LOCATION</key> <key>DEFAULT_INSTALL_LOCATION</key>
@ -253,7 +257,7 @@
<key>PATH_TYPE</key> <key>PATH_TYPE</key>
<integer>0</integer> <integer>0</integer>
<key>PERMISSIONS</key> <key>PERMISSIONS</key>
<integer>493</integer> <integer>1005</integer>
<key>TYPE</key> <key>TYPE</key>
<integer>1</integer> <integer>1</integer>
<key>UID</key> <key>UID</key>
@ -355,6 +359,38 @@
<key>UID</key> <key>UID</key>
<integer>0</integer> <integer>0</integer>
</dict> </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> </array>
<key>GID</key> <key>GID</key>
<integer>0</integer> <integer>0</integer>
@ -468,15 +504,29 @@
</dict> </dict>
<key>PAYLOAD_TYPE</key> <key>PAYLOAD_TYPE</key>
<integer>0</integer> <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> <key>VERSION</key>
<integer>2</integer> <integer>5</integer>
</dict> </dict>
<key>PACKAGE_SCRIPTS</key> <key>PACKAGE_SCRIPTS</key>
<dict> <dict>
<key>POSTINSTALL_PATH</key> <key>POSTINSTALL_PATH</key>
<dict/> <dict>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>PREINSTALL_PATH</key> <key>PREINSTALL_PATH</key>
<dict/> <dict>
<key>PATH_TYPE</key>
<integer>0</integer>
</dict>
<key>RESOURCES</key> <key>RESOURCES</key>
<array/> <array/>
</dict> </dict>
@ -486,6 +536,8 @@
<integer>1</integer> <integer>1</integer>
<key>CONCLUSION_ACTION</key> <key>CONCLUSION_ACTION</key>
<integer>0</integer> <integer>0</integer>
<key>FOLLOW_SYMBOLIC_LINKS</key>
<false/>
<key>IDENTIFIER</key> <key>IDENTIFIER</key>
<string>com.idrix.pkg.veracrypt</string> <string>com.idrix.pkg.veracrypt</string>
<key>LOCATION</key> <key>LOCATION</key>
@ -494,9 +546,19 @@
<string>veracrypt</string> <string>veracrypt</string>
<key>OVERWRITE_PERMISSIONS</key> <key>OVERWRITE_PERMISSIONS</key>
<false/> <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> <key>VERSION</key>
<string>1.24.7</string> <string>1.24.7</string>
</dict> </dict>
<key>TYPE</key>
<integer>0</integer>
<key>UUID</key> <key>UUID</key>
<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string> <string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
</dict> </dict>
@ -524,14 +586,15 @@
<dict> <dict>
<key>BACKGROUND</key> <key>BACKGROUND</key>
<dict> <dict>
<key>ALIGNMENT</key> <key>APPAREANCES</key>
<integer>4</integer> <dict>
<key>BACKGROUND_PATH</key> <key>DARK_AQUA</key>
<dict/> <dict/>
<key>CUSTOM</key> <key>LIGHT_AQUA</key>
<false/> <dict/>
<key>SCALING</key> </dict>
<integer>0</integer> <key>SHARED_SETTINGS_FOR_ALL_APPAREANCES</key>
<true/>
</dict> </dict>
<key>INSTALLATION TYPE</key> <key>INSTALLATION TYPE</key>
<dict> <dict>
@ -567,7 +630,7 @@
<dict/> <dict/>
</dict> </dict>
</dict> </dict>
<key>INSTALLATION TYPE</key> <key>MODE</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>INSTALLATION_STEPS</key> <key>INSTALLATION_STEPS</key>
@ -636,8 +699,6 @@
</dict> </dict>
<key>LICENSE</key> <key>LICENSE</key>
<dict> <dict>
<key>KEYWORDS</key>
<dict/>
<key>LOCALIZATIONS</key> <key>LOCALIZATIONS</key>
<array> <array>
<dict> <dict>
@ -813,10 +874,6 @@ https://osxfuse.github.io/
<true/> <true/>
</dict> </dict>
</array> </array>
<key>POSTINSTALL_PATH</key>
<dict/>
<key>PREINSTALL_PATH</key>
<dict/>
<key>RESOURCES</key> <key>RESOURCES</key>
<array/> <array/>
<key>ROOT_VOLUME_ONLY</key> <key>ROOT_VOLUME_ONLY</key>
@ -824,8 +881,6 @@ https://osxfuse.github.io/
</dict> </dict>
<key>PROJECT_SETTINGS</key> <key>PROJECT_SETTINGS</key>
<dict> <dict>
<key>ADVANCED_OPTIONS</key>
<dict/>
<key>BUILD_FORMAT</key> <key>BUILD_FORMAT</key>
<integer>0</integer> <integer>0</integer>
<key>BUILD_PATH</key> <key>BUILD_PATH</key>
@ -1004,7 +1059,11 @@ https://osxfuse.github.io/
</dict> </dict>
</array> </array>
<key>NAME</key> <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>
</dict> </dict>
<key>SHARED_GLOBAL_DATA</key> <key>SHARED_GLOBAL_DATA</key>