From b6dcea013e439099328dd15fd4335bd71d3a04da Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 12 Oct 2019 01:19:45 +0200 Subject: MacOSX: Add build scripts and modifications to linking against wxWidgets 3.1.2 for non legacy build targeting OSX 10.9+ --- src/Build/Resources/MacOSX/Info.plist.legacy.xml | 106 +++++++++++++++++++++++ src/Build/Resources/MacOSX/Info.plist.xml | 8 +- src/Build/build_veracrypt_macosx.sh | 14 +-- src/Build/build_veracrypt_macosx_legacy.sh | 32 +++++++ 4 files changed, 146 insertions(+), 14 deletions(-) create mode 100644 src/Build/Resources/MacOSX/Info.plist.legacy.xml create mode 100755 src/Build/build_veracrypt_macosx_legacy.sh (limited to 'src/Build') diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml new file mode 100644 index 00000000..14b69603 --- /dev/null +++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml @@ -0,0 +1,106 @@ + + + + + CFBundleInfoDictionaryVersion + 6.0 + + CFBundleIdentifier + org.idrix.VeraCrypt + + UTExportedTypeDeclarations + + + UTTypeIdentifier + org.idrix.veracrypt.hc + + UTTypeDescription + VeraCrypt Container File + + UTTypeConformsTo + + public.data + + + UTTypeTagSpecification + + public.filename-extension + + hc + tc + + + public.mime-type + application/veracrypt + + + + + CFBundleDocumentTypes + + + CFBundleTypeIconFile + VeraCrypt_Volume.icns + CFBundleTypeName + VeraCrypt Container File + CFBundleTypeRole + Viewer + LSHandlerRank + Owner + LSItemContentTypes + + + org.idrix.veracrypt.hc + + + + + CFBundleDevelopmentRegion + English + + CFBundleExecutable + VeraCrypt + + CFBundleIconFile + VeraCrypt.icns + + CFBundleName + VeraCrypt + + CFBundlePackageType + APPL + + CFBundleSignature + TRUE + + CFBundleVersion + 1.24.6 + + CFBundleShortVersionString + _VERSION_ + + CFBundleLongVersionString + VeraCrypt _VERSION_ + + LSArchitecturePriority + + x86_64 + i386 + + + LSMinimumSystemVersion + 10.7.0 + + LSRequiresCarbon + + + CSResourcesFileMapped + + + NSHighResolutionCapable + + + NSPrincipalClass + NSApplication + + diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 14b69603..771a3819 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -82,14 +82,8 @@ CFBundleLongVersionString VeraCrypt _VERSION_ - LSArchitecturePriority - - x86_64 - i386 - - LSMinimumSystemVersion - 10.7.0 + 10.9.0 LSRequiresCarbon diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh index 233afb20..a28ba8de 100755 --- a/src/Build/build_veracrypt_macosx.sh +++ b/src/Build/build_veracrypt_macosx.sh @@ -12,22 +12,22 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd) # directory where the VeraCrypt project has been checked out PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd) -# the sources of wxWidgets 3.0.3 must be extracted to the parent directory -export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4 +# the sources of wxWidgets 3.1.2 must be extracted to the parent directory +export WX_ROOT=$PARENTDIR/wxWidgets-3.1.2 echo "Using wxWidgets sources in $WX_ROOT" # this will be the temporary wxWidgets directory -export WX_BUILD_DIR=$PARENTDIR/wxBuild +export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.1.2 -# define the SDK version to use. We use 10.7 by default -export VC_OSX_TARGET=10.7 +# define the SDK version to use. We use 10.9 by default +export VC_OSX_TARGET=10.9 echo "Using MacOSX SDK $VC_OSX_TARGET" cd $SOURCEPATH echo "Building VeraCrypt" -make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package +# make WXSTATIC=FULL wxbuild && make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package # Uncomment below and comment line above to reuse existing wxWidgets build -# make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package \ No newline at end of file +make WXSTATIC=FULL clean && make WXSTATIC=FULL && make WXSTATIC=FULL package \ No newline at end of file diff --git a/src/Build/build_veracrypt_macosx_legacy.sh b/src/Build/build_veracrypt_macosx_legacy.sh new file mode 100755 index 00000000..6c86a7ff --- /dev/null +++ b/src/Build/build_veracrypt_macosx_legacy.sh @@ -0,0 +1,32 @@ +# +# Copyright (c) 2013-2017 IDRIX +# Governed by the Apache License 2.0 the full text of which is contained +# in the file License.txt included in VeraCrypt binary and source +# code distribution packages. +# + +# Absolute path this script is in +SCRIPTPATH=$(cd "$(dirname "$0")"; pwd) +# source directory which contains the Makefile +SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd) +# directory where the VeraCrypt project has been checked out +PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd) + +# the sources of wxWidgets 3.0.4 must be extracted to the parent directory +export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4 +echo "Using wxWidgets sources in $WX_ROOT" +0# this will be the temporary wxWidgets directory +export WX_BUILD_DIR=$PARENTDIR/wxBuild + +# define the SDK version to use. We use 10.7 by default +export VC_OSX_TARGET=10.7 +echo "Using MacOSX SDK $VC_OSX_TARGET" + + +cd $SOURCEPATH + +echo "Building VeraCrypt" +make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package + +# Uncomment below and comment line above to reuse existing wxWidgets build +# make WXSTATIC=1 clean && make WXSTATIC=1 && make WXSTATIC=1 package \ No newline at end of file -- cgit v1.2.3