Merge remote-tracking branch 'upstream/master' into sprint-to-release-fixup

Conflicts:
	tasks/build.js

Author: Marcel Gerber

CEF-Info.plist

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>11G56</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>libcef</string>
+	<key>CFBundleGetInfoString</key>
+	<string>CEF 1547</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.cef</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>cef</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1547</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1547</string>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>4G2008a</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>11E52</string>
+	<key>DTSDKName</key>
+	<string>macosx10.7</string>
+	<key>DTXcode</key>
+	<string>0452</string>
+	<key>DTXcodeBuild</key>
+	<string>4G2008a</string>
+</dict>
+</plist>

Gruntfile.js

@@ -118,8 +118,6 @@ module.exports = function (grunt) {
                     }
                 ]
             },
-            // FIXME: see stage-mac task issues with copying .app bundles
-            /*
             "mac": {
                 "files": [
                     {
@@ -128,9 +126,19 @@ module.exports = function (grunt) {
                         "src"       : ["**"],
                         "dest"      : "installer/mac/staging/<%= build.name %>.app/"
                     }
+                ],
+                options: {
+                    mode: true
+                }
+            },
+            "cefplist" : {
+                "files": [
+                    {
+                        "src"  : "CEF-Info.plist",
+                        "dest" : "installer/mac/staging/<%= build.name %>.app/Contents/Frameworks/Chromium Embedded Framework.framework/Resources/Info.plist"
+                    }
                 ]
             },
-            */
             "linux": {
                 "files": [
                     {

package.json

@@ -15,7 +15,7 @@
         "grunt": "0.4.1",
         "grunt-cli": "0.1.6",
         "grunt-contrib-jshint": "0.2.0",
-        "grunt-contrib-copy": "0.4.0",
+        "grunt-contrib-copy": "0.5.0",
         "grunt-contrib-clean": "0.4.0",
         "guid": "0.0.10",
         "grunt-curl": "2.0.2",