MacOSX: Add build scripts and modifications to linking against wxWidgets 3.1.2 for non legacy build targeting OSX 10.9+

author: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2019-10-12 01:19:45 +0200
committer: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2019-10-14 15:05:24 +0200
commit: b6dcea013e439099328dd15fd4335bd71d3a04da (patch)
tree: 07eb4e492ffbb2f09ebb2f302471b7f392ca18a6 /src/Build
parent: f56a8c49f90bda734110f5ee28b2c405b417b057 (diff)
download: VeraCrypt-b6dcea013e439099328dd15fd4335bd71d3a04da.tar.gz
VeraCrypt-b6dcea013e439099328dd15fd4335bd71d3a04da.zip
4 files changed, 146 insertions, 14 deletions
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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
+<dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+
+	<key>CFBundleIdentifier</key>
+	<string>org.idrix.VeraCrypt</string>
+	
+ 	<key>UTExportedTypeDeclarations</key>
+    <array>
+    	<dict>
+			<key>UTTypeIdentifier</key>
+			<string>org.idrix.veracrypt.hc</string>
+            
+            <key>UTTypeDescription</key>
+            <string>VeraCrypt Container File</string>
+            
+            <key>UTTypeConformsTo</key>
+            <array>
+            	<string>public.data</string>
+        	</array>
+                
+            <key>UTTypeTagSpecification</key>
+            <dict>
+                <key>public.filename-extension</key>
+                <array>
+                    <string>hc</string>
+                    <string>tc</string>
+                </array>
+                    
+                <key>public.mime-type</key>
+                <string>application/veracrypt</string>
+            </dict>
+            </dict>
+        </array>
+
+	<key>CFBundleDocumentTypes</key>
+	<array>
+    	<dict>
+     	   <key>CFBundleTypeIconFile</key>
+     	   <string>VeraCrypt_Volume.icns</string>
+    	    <key>CFBundleTypeName</key>
+        	<string>VeraCrypt Container File</string>
+	        <key>CFBundleTypeRole</key>
+    	    <string>Viewer</string>
+        	<key>LSHandlerRank</key>
+        	<string>Owner</string>
+        	<key>LSItemContentTypes</key>
+        	<array>
+            	<!-- my app supports files with my custom extension (see UTExportedTypeDeclarations) -->
+            	<string>org.idrix.veracrypt.hc</string>
+        	</array>
+    	</dict>
+	</array>
+
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+
+	<key>CFBundleExecutable</key>
+	<string>VeraCrypt</string>
+
+	<key>CFBundleIconFile</key>
+	<string>VeraCrypt.icns</string>
+
+	<key>CFBundleName</key>
+	<string>VeraCrypt</string>
+
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+
+	<key>CFBundleSignature</key>
+	<string>TRUE</string>
+
+	<key>CFBundleVersion</key>
+	<string>1.24.6</string>
+
+	<key>CFBundleShortVersionString</key>
+	<string>_VERSION_</string>
+
+	<key>CFBundleLongVersionString</key>
+	<string>VeraCrypt _VERSION_</string>
+
+	<key>LSArchitecturePriority</key>
+	<array>
+		<string>x86_64</string>
+		<string>i386</string>
+	</array>
+
+	<key>LSMinimumSystemVersion</key>
+	<string>10.7.0</string>
+
+	<key>LSRequiresCarbon</key>
+	<false/>
+
+	<key>CSResourcesFileMapped</key>
+	<true/>
+
+    <key>NSHighResolutionCapable</key>
+    <true/>
+
+    <key>NSPrincipalClass</key>
+    <string>NSApplication</string>
+</dict>
+</plist>
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 @@
 	<key>CFBundleLongVersionString</key>
 	<string>VeraCrypt _VERSION_</string>
 
-	<key>LSArchitecturePriority</key>
-	<array>
-		<string>x86_64</string>
-		<string>i386</string>
-	</array>
-
 	<key>LSMinimumSystemVersion</key>
-	<string>10.7.0</string>
+	<string>10.9.0</string>
 
 	<key>LSRequiresCarbon</key>
 	<false/>
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
author	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2019-10-12 01:19:45 +0200
committer	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2019-10-14 15:05:24 +0200
commit	b6dcea013e439099328dd15fd4335bd71d3a04da (patch)
tree	07eb4e492ffbb2f09ebb2f302471b7f392ca18a6 /src/Build
parent	f56a8c49f90bda734110f5ee28b2c405b417b057 (diff)
download	VeraCrypt-b6dcea013e439099328dd15fd4335bd71d3a04da.tar.gz VeraCrypt-b6dcea013e439099328dd15fd4335bd71d3a04da.zip