Mac OS X cmake changes and bundle fixes

For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.

12 files changed, 34 insertions, 138 deletions

diff --git a/source/darwin/blender.app/Contents/Info.plist b/source/darwin/blender.app/Contents/Info.plist
index 0accb3e9940..2f5d235a619 100644
--- a/source/darwin/blender.app/Contents/Info.plist
+++ b/source/darwin/blender.app/Contents/Info.plist
@@ -20,13 +20,13 @@
 	<string>Blender</string>

 	<key>CFBundleIdentifier</key>

 	<string>org.blenderfoundation.blender</string>

-	

+

 	<key>CFBundleVersion</key>

-	<string>VERSION, DATE, Blender Foundation</string>

+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

 	<key>CFBundleShortVersionString</key>

-	<string>VERSION</string>

+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>

 	<key>CFBundleGetInfoString</key>

-	<string>VERSION, DATE, Blender Foundation</string>

+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

 

 	<key>CFBundleDocumentTypes</key>

 	<array>

diff --git a/source/darwin/blendercreator.app/Contents/Info.plist b/source/darwin/blendercreator.app/Contents/Info.plist
deleted file mode 100644
index 08709cd26e3..00000000000
--- a/source/darwin/blendercreator.app/Contents/Info.plist
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>CFBundleExecutable</key>

-	<string>blendercreator</string>

-

-	<key>CFBundlePackageType</key>

-	<string>APPL</string>

-	<key>CFBundleSignature</key>

-	<string>????</string>

-

-	<key>CFBundleIconFile</key>

-	<string>blender creator icon.icns</string>

-

-	<key>CFBundleName</key>

-	<string>BlenderCreator</string>

-	<key>CFBundleIdentifier</key>

-	<string>com.nantechnologies.blendercreator</string>

-	

-	<key>CFBundleVersion</key>

-	<string>VERSION, DATE, Copyright NaN Technologies BV</string>

-	<key>CFBundleShortVersionString</key>

-	<string>VERSION</string>

-	<key>CFBundleGetInfoString</key>

-	<string>VERSION, DATE, Copyright NaN Technologies BV</string>

-

-	<key>CFBundleDocumentTypes</key>

-	<array>

-		<dict>

-			<key>CFBundleTypeIconFile</key>

-			<string>blender file icon.icns</string>

-			<key>CFBundleTypeName</key>

-			<string>Blender File</string>

-			<key>CFBundleTypeOSTypes</key>

-			<array>

-				<string>BLND</string>

-			</array>

-			<key>CFBundleTypeExtensions</key>

-			<array>

-				<string>blend</string>

-			</array>

-			<key>CFBundleTypeRole</key>

-			<string>Editor</string>

-			<key>LSIsAppleDefaultForType</key>

-			<true/>			

-		</dict>

-	</array>

-</dict>

-</plist>

diff --git a/source/darwin/blendercreator.app/Contents/MacOS/blendercreator b/source/darwin/blendercreator.app/Contents/MacOS/blendercreator
deleted file mode 100644
index 5e05e74a307..00000000000
--- a/source/darwin/blendercreator.app/Contents/MacOS/blendercreator
+++ /dev/null
@@ -1 +0,0 @@
-placeholder

diff --git a/source/darwin/blendercreator.app/Contents/PkgInfo b/source/darwin/blendercreator.app/Contents/PkgInfo
deleted file mode 100644
index bd04210fb49..00000000000
--- a/source/darwin/blendercreator.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns b/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns
deleted file mode 100644
index 5eef94afde9..00000000000
--- a/source/darwin/blendercreator.app/Contents/Resources/blender creator icon.icns
+++ /dev/null
diff --git a/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns b/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns
deleted file mode 100644
index 9065f1b359c..00000000000
--- a/source/darwin/blendercreator.app/Contents/Resources/blender file icon.icns
+++ /dev/null
diff --git a/source/darwin/blenderplayer.app/Contents/Info.plist b/source/darwin/blenderplayer.app/Contents/Info.plist
index 18c4438884a..f99338d6c47 100644
--- a/source/darwin/blenderplayer.app/Contents/Info.plist
+++ b/source/darwin/blenderplayer.app/Contents/Info.plist
@@ -2,13 +2,35 @@
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">

 <plist version="0.9">

 <dict>

+	<key>CFBundleInfoDictionaryVersion</key>

+	<string>6.0</string>

+

+	<key>CFBundleExecutable</key>

+	<string>blenderplayer</string>

+

+	<key>CFBundlePackageType</key>

+	<string>APPL</string>

+	<key>CFBundleSignature</key>

+	<string>????</string>

+

+	<key>CFBundleIconFile</key>

+	<string>blender player icon.icns</string>

+

+	<key>CFBundleName</key>

+	<string>BlenderPlayer</string>

+	<key>CFBundleIdentifier</key>

+	<string>org.blenderfoundation.blenderplayer</string>

+

+	<key>CFBundleVersion</key>

+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

+	<key>CFBundleShortVersionString</key>

+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>

+	<key>CFBundleGetInfoString</key>

+	<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}, Blender Foundation</string>

+

 	<key>CFBundleDocumentTypes</key>

 	<array>

 		<dict>

-			<key>CFBundleTypeExtensions</key>

-			<array>

-				<string>blend</string>

-			</array>

 			<key>CFBundleTypeIconFile</key>

 			<string>blender file icon.icns</string>

 			<key>CFBundleTypeName</key>

@@ -17,31 +39,15 @@
 			<array>

 				<string>BLND</string>

 			</array>

+			<key>CFBundleTypeExtensions</key>

+			<array>

+				<string>blend</string>

+			</array>

 			<key>CFBundleTypeRole</key>

 			<string>Viewer</string>

 			<key>LSIsAppleDefaultForType</key>

 			<false/>

 		</dict>

 	</array>

-	<key>CFBundleExecutable</key>

-	<string>blenderplayer</string>

-	<key>CFBundleGetInfoString</key>

-	<string>VERSION, DATE, Blender Foundation</string>

-	<key>CFBundleIconFile</key>

-	<string>blender player icon.icns</string>

-	<key>CFBundleIdentifier</key>

-	<string>org.blenderfoundation.blenderplayer</string>

-	<key>CFBundleInfoDictionaryVersion</key>

-	<string>6.0</string>

-	<key>CFBundleName</key>

-	<string>BlenderPlayer</string>

-	<key>CFBundlePackageType</key>

-	<string>APPL</string>

-	<key>CFBundleShortVersionString</key>

-	<string>VERSION</string>

-	<key>CFBundleSignature</key>

-	<string>????</string>

-	<key>CFBundleVersion</key>

-	<string>VERSION, DATE, Blender Foundation</string>

 </dict>

 </plist>

diff --git a/source/darwin/blenderpublisher.app/Contents/Info.plist b/source/darwin/blenderpublisher.app/Contents/Info.plist
deleted file mode 100644
index f22de5a4460..00000000000
--- a/source/darwin/blenderpublisher.app/Contents/Info.plist
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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>CFBundleExecutable</key>

-	<string>blenderpublisher</string>

-

-	<key>CFBundlePackageType</key>

-	<string>APPL</string>

-	<key>CFBundleSignature</key>

-	<string>????</string>

-

-	<key>CFBundleIconFile</key>

-	<string>blender publisher icon.icns</string>

-

-	<key>CFBundleName</key>

-	<string>BlenderPublisher</string>

-	<key>CFBundleIdentifier</key>

-	<string>com.nantechnologies.blenderpublisher</string>

-	

-	<key>CFBundleVersion</key>

-	<string>VERSION, DATE, Copyright NaN Technologies BV</string>

-	<key>CFBundleShortVersionString</key>

-	<string>VERSION</string>

-	<key>CFBundleGetInfoString</key>

-	<string>VERSION, DATE, Copyright NaN Technologies BV</string>

-

-	<key>CFBundleDocumentTypes</key>

-	<array>

-		<dict>

-			<key>CFBundleTypeIconFile</key>

-			<string>blender file icon.icns</string>

-			<key>CFBundleTypeName</key>

-			<string>Blender File</string>

-			<key>CFBundleTypeOSTypes</key>

-			<array>

-				<string>BLND</string>

-			</array>

-			<key>CFBundleTypeExtensions</key>

-			<array>

-				<string>blend</string>

-			</array>

-			<key>CFBundleTypeRole</key>

-			<string>Editor</string>

-			<key>LSIsAppleDefaultForType</key>

-			<true/>	

-		</dict>

-	</array>

-</dict>

-</plist>

diff --git a/source/darwin/blenderpublisher.app/Contents/MacOS/blenderpublisher b/source/darwin/blenderpublisher.app/Contents/MacOS/blenderpublisher
deleted file mode 100644
index 5e05e74a307..00000000000
--- a/source/darwin/blenderpublisher.app/Contents/MacOS/blenderpublisher
+++ /dev/null
@@ -1 +0,0 @@
-placeholder

diff --git a/source/darwin/blenderpublisher.app/Contents/PkgInfo b/source/darwin/blenderpublisher.app/Contents/PkgInfo
deleted file mode 100644
index bd04210fb49..00000000000
--- a/source/darwin/blenderpublisher.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/source/darwin/blenderpublisher.app/Contents/Resources/blender file icon.icns b/source/darwin/blenderpublisher.app/Contents/Resources/blender file icon.icns
deleted file mode 100644
index a6041899cfb..00000000000
--- a/source/darwin/blenderpublisher.app/Contents/Resources/blender file icon.icns
+++ /dev/null
diff --git a/source/darwin/blenderpublisher.app/Contents/Resources/blender publisher icon.icns b/source/darwin/blenderpublisher.app/Contents/Resources/blender publisher icon.icns
deleted file mode 100644
index 90784597129..00000000000
--- a/source/darwin/blenderpublisher.app/Contents/Resources/blender publisher icon.icns
+++ /dev/null