Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

Commit 539e3e4

Browse files
swmitraswmitra
authored
Merge pull request #600 from adobe/master
Merge master into release for Brackets 1.9
2 parents 0ad2696 + 8583247 commit 539e3e4

15 files changed

+43
-18
lines changed

‎Gruntfile.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,7 @@ module.exports = function (grunt) {
8282
},
8383
"node-win": {
8484
"dest" : "<%= downloads %>",
85-
"src" : process.arch === "x64" ?
86-
"http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" :
87-
"http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
85+
"src" : "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe"
8886
}
8987
},
9088
"clean": {

‎appshell/appshell_extensions_gtk.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ int GErrorToErrorCode(GError *gerror) {
6464

6565
int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
6666
{
67-
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";
67+
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";
6868
gchar *remoteDebugging;
6969
gchar *cmdline;
7070
int error = ERR_BROWSER_NOT_INSTALLED;

‎appshell/appshell_extensions_mac.mm

+1
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
263263
@"--disable-default-apps",
264264
debugPortCommandlineArguments,
265265
debugProfilePath,
266+
@"--disk-cache-size=250000000",
266267
urlString,
267268
nil];
268269

‎appshell/appshell_extensions_win.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ int32 OpenLiveBrowser(ExtensionString argURL, bool enableRemoteDebugging)
342342
profilePath += L"\\live-dev-profile";
343343
args += L" --user-data-dir=\"";
344344
args += profilePath;
345-
args += L"\" --no-first-run --no-default-browser-check --disable-default-apps --allow-file-access-from-files --remote-debugging-port=9222 ";
345+
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 ";
346346
} else {
347347
args += L" ";
348348
}

‎appshell/appshell_helpers_gtk.cpp

+10-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
#include "appshell/browser/resource.h"
2727
#include "appshell/common/client_switches.h"
28+
#include "appshell/version_linux.h"
2829
#include "include/cef_base.h"
2930
#include "include/cef_version.h"
3031

@@ -114,13 +115,18 @@ CefString AppGetCachePath() {
114115
}
115116

116117
CefString AppGetProductVersionString() {
117-
// TODO
118-
return CefString("");
118+
std::string s = APP_NAME "/" APP_VERSION;
119+
CefString ret;
120+
ret.FromString(s);
121+
return ret;
119122
}
120123

121124
CefString AppGetChromiumVersionString() {
122-
// TODO
123-
return CefString("");
125+
std::wostringstream versionStream(L"");
126+
versionStream << L"Chrome/" << cef_version_info(2) << L"." << cef_version_info(3)
127+
<< L"." << cef_version_info(4) << L"." << cef_version_info(5);
128+
129+
return CefString(versionStream.str());
124130
}
125131

126132
char* AppInitWorkingDirectory() {

‎appshell/mac/Info.plist

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>1.8.0</string>
22+
<string>1.9.0</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.8.0</string>
24+
<string>1.9.0</string>
2525
<key>NSMainNibFile</key>
2626
<string>MainMenu</string>
2727
<key>NSPrincipalClass</key>

‎appshell/version.rc

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
3131
//
3232

3333
VS_VERSION_INFO VERSIONINFO
34-
FILEVERSION 1,8,0,0
34+
FILEVERSION 1,9,0,0
3535
/* PRODUCTVERSION 1,0,0,0 */
3636
FILEOS VOS__WINDOWS32
3737
FILETYPE VFT_APP
@@ -42,7 +42,7 @@ BEGIN
4242
BEGIN
4343
VALUE "CompanyName", "brackets.io\0"
4444
VALUE "FileDescription", "\0"
45-
VALUE "FileVersion", "Release 1.8.0\0"
45+
VALUE "FileVersion", "Release 1.9.0\0"
4646
VALUE "ProductName", APP_NAME "\0"
4747
VALUE "ProductVersion", "\0"
4848
VALUE "LegalCopyright", "(c) 2012 Adobe Systems, Inc.\0"

‎appshell/version_linux.h

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#define APP_VERSION "1.9.0.0"

‎installer/linux/build_archive.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
chmod 755 debian/package-root/opt/brackets/brackets
66
chmod 755 debian/package-root/opt/brackets/Brackets
77
chmod 755 debian/package-root/opt/brackets/Brackets-node
8-
chmod 755 debian/package-root/opt/brackets/www/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/xdg-open
8+
chmod 755 debian/package-root/opt/brackets/www/node_modules/opn/xdg-open
99

1010
# set permissions on subdirectories
1111
find debian -type d -exec chmod 755 {} \;

‎installer/linux/build_installer.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
chmod 755 debian/package-root/opt/brackets/brackets
66
chmod 755 debian/package-root/opt/brackets/Brackets
77
chmod 755 debian/package-root/opt/brackets/Brackets-node
8-
chmod 755 debian/package-root/opt/brackets/www/LiveDevelopment/MultiBrowserImpl/launchers/node/node_modules/opn/xdg-open
8+
chmod 755 debian/package-root/opt/brackets/www/node_modules/opn/xdg-open
99
chmod 755 debian/package-root/DEBIAN/prerm
1010
chmod 755 debian/package-root/DEBIAN/postrm
1111
chmod 755 debian/package-root/DEBIAN/postinst

‎installer/mac/buildInstaller.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# config
44
releaseName="Brackets"
5-
version="1.8"
5+
version="1.9"
66
dmgName="${releaseName} Release ${version}"
77
format="bzip2"
88
encryption="none"

‎installer/win/Brackets.wxs

+9
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,15 @@
9898
<RegistryValue Root="HKCR" Key="directory\shell\!(loc.ProductName)\command" Value="[INSTALLDIR]$(var.ExeName).exe &quot;%1&quot;"
9999
Type="string" />
100100

101+
<RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)" Value="!(loc.ExplorerDirectoryOpenContextMenu)"
102+
Type="string" />
103+
104+
<RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)" Name="Icon" Value="[INSTALLDIR]$(var.ExeName).exe"
105+
Type="string" />
106+
107+
<RegistryValue Root="HKCR" Key="directory\background\shell\!(loc.ProductName)\command" Value="[INSTALLDIR]$(var.ExeName).exe &quot;%V&quot;"
108+
Type="string" />
109+
101110
</Component>
102111

103112
<!-- Start Menu Shortcuts-->

‎installer/win/brackets-win-install-build.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ default="build.mul">
1212
<!-- See also: product name definitions in Brackets_<locale>.wxl -->
1313
<property name="product.shortname" value="Brackets"/>
1414
<property name="product.release.number.major" value="1"/>
15-
<property name="product.release.number.minor" value="8"/>
15+
<property name="product.release.number.minor" value="9"/>
1616
<property name="product.version.number" value="${product.release.number.major}.${product.release.number.minor}"/>
1717
<property name="product.version.name" value="Release ${product.version.number}"/>
1818
<property name="product.fullname" value="Brackets ${product.version.name}"/>

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "Brackets-Shell",
3-
"version": "1.8.0-0",
3+
"version": "1.9.0-0",
44
"homepage": "http://brackets.io",
55
"issues": {
66
"url": "http://github.com/adobe/brackets-shell/issues"

‎tasks/set-release.js

+10
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ module.exports = function (grunt) {
4949
buildInstallerScriptPath = "installer/mac/buildInstaller.sh",
5050
versionRcPath = "appshell/version.rc",
5151
infoPlistPath = "appshell/mac/Info.plist",
52+
linuxVersionFile = "appshell/version_linux.h",
5253
release = grunt.option("release") || "",
5354
text,
5455
newVersion;
@@ -113,5 +114,14 @@ module.exports = function (grunt) {
113114
"$1" + newVersion.version + "$3"
114115
);
115116
grunt.file.write(infoPlistPath, text);
117+
118+
// 6. Open appshell/version_linux.h and change `APP_VERSION`
119+
text = grunt.file.read(linuxVersionFile);
120+
text = safeReplace(
121+
text,
122+
/APP_VERSION "(\d+\.\d+\.\d+\.\d+)"/,
123+
'APP_VERSION "' + newVersion.major + "." + newVersion.minor + "." + newVersion.patch + "." + (newVersion.build.length ? newVersion.build : "0") + '"'
124+
);
125+
grunt.file.write(linuxVersionFile, text);
116126
});
117127
};

0 commit comments

Comments
 (0)