Merge pull request #600 from adobe/master

Merge master into release for Brackets 1.9
adobe · Mar 16, 2017 · 539e3e4 · 539e3e4
2 parents 0ad2696 + 8583247
commit 539e3e4
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 18 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -82,9 +82,7 @@ module.exports = function (grunt) {
             },
             "node-win": {
                 "dest"      : "<%= downloads %>",
-                "src"       : process.arch === "x64" ?
-                                "http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
-                                "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
+                "src"       : "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
             }
         },
         "clean": {

diff --git a/appshell/appshell_extensions_gtk.cpp b/appshell/appshell_extensions_gtk.cpp
@@ -64,7 +64,7 @@ int GErrorToErrorCode(GError *gerror) {
 
 int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
 {
-    const char *remoteDebuggingFormat = "--no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --temp-profile --user-data-dir=%s --remote-debugging-port=9222";
+    const char *remoteDebuggingFormat = "--no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --temp-profile --user-data-dir=%s --disk-cache-size=250000000 --remote-debugging-port=9222";
     gchar *remoteDebugging;
     gchar *cmdline;
     int error = ERR_BROWSER_NOT_INSTALLED;

diff --git a/appshell/appshell_extensions_mac.mm b/appshell/appshell_extensions_mac.mm
@@ -263,6 +263,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
                       @"--disable-default-apps",
                       debugPortCommandlineArguments,
                       debugProfilePath,
+                      @"--disk-cache-size=250000000",
                       urlString,
                       nil];
 

diff --git a/appshell/appshell_extensions_win.cpp b/appshell/appshell_extensions_win.cpp
@@ -342,7 +342,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
         profilePath += L"\\live-dev-profile";
         args += L" --user-data-dir=\"";
         args += profilePath;
-        args += L"\" --no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --remote-debugging-port=9222 ";
+        args += L"\" --disk-cache-size=250000000 --no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --remote-debugging-port=9222 ";
     } else {
         args += L" ";
     }

diff --git a/appshell/appshell_helpers_gtk.cpp b/appshell/appshell_helpers_gtk.cpp
@@ -25,6 +25,7 @@
 
 #include "appshell/browser/resource.h"
 #include "appshell/common/client_switches.h"
+#include "appshell/version_linux.h"
 #include "include/cef_base.h"
 #include "include/cef_version.h"
 
@@ -114,13 +115,18 @@ CefString AppGetCachePath() {
 }
 
 CefString AppGetProductVersionString() {
-    // TODO
-    return CefString("");
+    std::string s = APP_NAME "/" APP_VERSION;
+    CefString ret;
+    ret.FromString(s);
+    return ret;
 }
 
 CefString AppGetChromiumVersionString() {
-    // TODO
-    return CefString("");
+    std::wostringstream versionStream(L"");
+    versionStream << L"Chrome/" << cef_version_info(2) << L"." << cef_version_info(3)
+                  << L"." << cef_version_info(4) << L"." << cef_version_info(5);
+
+    return CefString(versionStream.str());
 }
 
 char* AppInitWorkingDirectory() {

diff --git a/appshell/mac/Info.plist b/appshell/mac/Info.plist
@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.0</string>
+	<string>1.9.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8.0</string>
+	<string>1.9.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

diff --git a/appshell/version.rc b/appshell/version.rc
@@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    	1,8,0,0
+FILEVERSION    	1,9,0,0
 /* PRODUCTVERSION 	1,0,0,0 */
 FILEOS         	VOS__WINDOWS32
 FILETYPE       	VFT_APP
@@ -42,7 +42,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "brackets.io\0"
             VALUE "FileDescription",  "\0"
-            VALUE "FileVersion",      "Release 1.8.0\0"
+            VALUE "FileVersion",      "Release 1.9.0\0"
             VALUE "ProductName",      APP_NAME "\0"
             VALUE "ProductVersion",   "\0"
             VALUE "LegalCopyright",   "(c) 2012 Adobe Systems, Inc.\0"

diff --git a/appshell/version_linux.h b/appshell/version_linux.h
@@ -0,0 +1 @@
+#define APP_VERSION "1.9.0.0"
diff --git a/installer/linux/build_archive.sh b/installer/linux/build_archive.sh
@@ -5,7 +5,7 @@
 chmod 755 debian/package-root/opt/brackets/brackets
 chmod 755 debian/package-root/opt/brackets/Brackets
 chmod 755 debian/package-root/opt/brackets/Brackets-node
-chmod 755 debian/package-root/opt/brackets/www/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/xdg-open
+chmod 755 debian/package-root/opt/brackets/www/node_modules/opn/xdg-open
 
 # set permissions on subdirectories
 find debian -type d -exec chmod 755 {} \;

diff --git a/installer/linux/build_installer.sh b/installer/linux/build_installer.sh
@@ -5,7 +5,7 @@
 chmod 755 debian/package-root/opt/brackets/brackets
 chmod 755 debian/package-root/opt/brackets/Brackets
 chmod 755 debian/package-root/opt/brackets/Brackets-node
-chmod 755 debian/package-root/opt/brackets/www/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/xdg-open
+chmod 755 debian/package-root/opt/brackets/www/node_modules/opn/xdg-open
 chmod 755 debian/package-root/DEBIAN/prerm
 chmod 755 debian/package-root/DEBIAN/postrm
 chmod 755 debian/package-root/DEBIAN/postinst

diff --git a/installer/mac/buildInstaller.sh b/installer/mac/buildInstaller.sh
@@ -2,7 +2,7 @@
 
 # config
 releaseName="Brackets"
-version="1.8"
+version="1.9"
 dmgName="${releaseName} Release ${version}"
 format="bzip2"
 encryption="none"

diff --git a/installer/win/Brackets.wxs b/installer/win/Brackets.wxs
@@ -98,6 +98,15 @@
             <RegistryValue Root="HKCR" Key="directory\shell\!(loc.ProductName)\command" Value="[INSTALLDIR]$(var.ExeName).exe &quot;%1&quot;"
                                Type="string" />
 
+            <RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)" Value="!(loc.ExplorerDirectoryOpenContextMenu)"
+                               Type="string" />
+
+            <RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)" Name="Icon" Value="[INSTALLDIR]$(var.ExeName).exe"
+                               Type="string" />
+
+            <RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)\command" Value="[INSTALLDIR]$(var.ExeName).exe &quot;%V&quot;"
+                               Type="string" />
+
         </Component>
 
         <!-- Start Menu Shortcuts-->

diff --git a/installer/win/brackets-win-install-build.xml b/installer/win/brackets-win-install-build.xml
@@ -12,7 +12,7 @@ default="build.mul">
   <!-- See also: product name definitions in Brackets_<locale>.wxl -->
   <property name="product.shortname" value="Brackets"/>
   <property name="product.release.number.major" value="1"/>
-  <property name="product.release.number.minor" value="8"/>
+  <property name="product.release.number.minor" value="9"/>
   <property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
   <property name="product.version.name" value="Release ${product.version.number}"/>
   <property name="product.fullname" value="Brackets ${product.version.name}"/>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "Brackets-Shell",
-    "version": "1.8.0-0",
+    "version": "1.9.0-0",
     "homepage": "http://brackets.io",
     "issues": {
         "url": "http://github.com/adobe/brackets-shell/issues"

diff --git a/tasks/set-release.js b/tasks/set-release.js
@@ -49,6 +49,7 @@ module.exports = function (grunt) {
             buildInstallerScriptPath    = "installer/mac/buildInstaller.sh",
             versionRcPath               = "appshell/version.rc",
             infoPlistPath               = "appshell/mac/Info.plist",
+            linuxVersionFile            = "appshell/version_linux.h",
             release                     = grunt.option("release") || "",
             text,
             newVersion;
@@ -113,5 +114,14 @@ module.exports = function (grunt) {
             "$1" + newVersion.version + "$3"
         );
         grunt.file.write(infoPlistPath, text);
+
+        // 6. Open appshell/version_linux.h and change `APP_VERSION`
+        text = grunt.file.read(linuxVersionFile);
+        text = safeReplace(
+            text,
+            /APP_VERSION "(\d+\.\d+\.\d+\.\d+)"/,
+            'APP_VERSION "' + newVersion.major + "." + newVersion.minor + "." + newVersion.patch + "." + (newVersion.build.length ? newVersion.build : "0") + '"'
+        );
+        grunt.file.write(linuxVersionFile, text);
     });
 };