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

Commit 08b4fec

Browse files
jasonsanjosejasonsanjose
committed
merge with sprint 24 master, fix build errors, and cross fingers
2 parents 36f1616 + e146c39 commit 08b4fec

File tree

218 files changed

+64595
-3592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+64595
-3592
lines changed

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Auto detect text files and perform LF normalization
2+
* text=auto

‎.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
22
*.swp
33
xcodebuild
44
xcodebuild/*
5+
/node_modules
6+
/npm-debug.log
7+
/downloads
8+
9+
appshell.xcodeproj
10+
Brackets.vcxproj
11+
appshell.sln
12+
libcef_dll_wrapper.vcxproj
513

614
*.pbxuser
715
*.perspective
@@ -45,3 +53,4 @@ libcef_dll_wrapper.target.mk
4553
appshell/gtk
4654
appshell/gtk/*
4755

56+
appshell/node-core/node_modules

‎.jshintrc

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
{
2+
"bitwise" : true,
3+
"curly" : true,
4+
"eqeqeq" : true,
5+
"forin" : true,
6+
"immed" : true,
7+
"latedef" : true,
8+
"newcap" : true,
9+
"noarg" : true,
10+
"noempty" : true,
11+
"nonew" : true,
12+
"plusplus" : true,
13+
"regexp" : true,
14+
"undef" : true,
15+
"strict" : true,
16+
"trailing" : false,
17+
18+
"asi" : false,
19+
"boss" : false,
20+
"debug" : false,
21+
"eqnull" : false,
22+
"es5" : false,
23+
"esnext" : false,
24+
"evil" : false,
25+
"expr" : false,
26+
"funcscope" : false,
27+
"globalstrict" : false,
28+
"iterator" : false,
29+
"lastsemic" : false,
30+
"laxbreak" : false,
31+
"laxcomma" : false,
32+
"loopfunc" : false,
33+
"multistr" : false,
34+
"onecase" : false,
35+
"proto" : false,
36+
"regexdash" : false,
37+
"scripturl" : false,
38+
"smarttabs" : false,
39+
"shadow" : false,
40+
"sub" : false,
41+
"supernew" : false,
42+
"validthis" : false,
43+
44+
"browser" : true,
45+
"couch" : false,
46+
"devel" : false,
47+
"dojo" : false,
48+
"jquery" : false,
49+
"mootools" : false,
50+
"node" : false,
51+
"nonstandard" : false,
52+
"prototypejs" : false,
53+
"rhino" : false,
54+
"wsh" : false,
55+
56+
"nomen" : false,
57+
"onevar" : false,
58+
"passfail" : false,
59+
"white" : false,
60+
61+
"maxerr" : 100,
62+
"predef" : [
63+
],
64+
"indent" : 4,
65+
"globals" : [
66+
"require",
67+
"define",
68+
"brackets",
69+
"$",
70+
"PathUtils",
71+
"window",
72+
"navigator",
73+
"Mustache"
74+
]
75+
}

‎Brackets.vcxproj

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Gruntfile.js

Lines changed: 176 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,176 @@
1+
/*
2+
* Copyright (c) 2013 Adobe Systems Incorporated. All rights reserved.
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a
5+
* copy of this software and associated documentation files (the "Software"),
6+
* to deal in the Software without restriction, including without limitation
7+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
* and/or sell copies of the Software, and to permit persons to whom the
9+
* Software is furnished to do so, subject to the following conditions:
10+
*
11+
* The above copyright notice and this permission notice shall be included in
12+
* all copies or substantial portions of the Software.
13+
*
14+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
* DEALINGS IN THE SOFTWARE.
21+
*
22+
*/
23+
/*jslint regexp:true*/
24+
/*global module, require, process*/
25+
module.exports = function (grunt) {
26+
"use strict";
27+
28+
var common = require("./tasks/common")(grunt),
29+
resolve = common.resolve,
30+
staging = (common.platform() === "mac") ? "installer/mac/staging/<%= build.name %>.app/Contents" : "installer/win/staging";
31+
32+
grunt.initConfig({
33+
"pkg": grunt.file.readJSON("package.json"),
34+
"curl-dir": {
35+
/* linux not supported yet */
36+
/*
37+
linux: {
38+
dest : "<%= cef_zip %>",
39+
src : "https://docs.google.com/file/d/0B7as0diokeHxeTNqZFIyNWZKSWM/edit?usp=sharing"
40+
},
41+
*/
42+
/* mac */
43+
"cef-mac": {
44+
"dest" : "downloads/",
45+
"src" : "http://chromiumembedded.googlecode.com/files/cef_binary_<%= cef.version %>_macosx.zip"
46+
},
47+
"node-mac": {
48+
"dest" : "downloads/",
49+
"src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz"
50+
},
51+
/* win */
52+
"cef-win": {
53+
"dest" : "downloads/",
54+
"src" : "http://chromiumembedded.googlecode.com/files/cef_binary_<%= cef.version %>_windows.zip"
55+
},
56+
"node-win": {
57+
"dest" : "downloads/",
58+
"src" : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
59+
"http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
60+
}
61+
},
62+
"clean": {
63+
"downloads" : ["downloads"],
64+
"installer-mac" : ["installer/mac/*.dmg"],
65+
"installer-win" : ["installer/win/*.msi"],
66+
"staging-mac" : ["installer/mac/staging"],
67+
"staging-win" : ["installer/win/staging"],
68+
"www" : ["<%= build.staging %>/www", "<%= build.staging %>/samples"]
69+
},
70+
"copy": {
71+
"win": {
72+
"files": [
73+
{
74+
"expand" : true,
75+
"cwd" : "Release/",
76+
"src" : [
77+
"**",
78+
"!*.pdb",
79+
"!dev/**",
80+
"!obj/**",
81+
"!lib/**",
82+
"!avformat-54.dll",
83+
"!avutil-51.dll",
84+
"!avcodec-54.dll",
85+
"!d3dcompiler_43.dll",
86+
"!d3dx9_43.dll",
87+
"!libEGL.dll",
88+
"!libGLESv2.dll",
89+
"!cefclient.exe",
90+
"!debug.log"
91+
],
92+
"dest" : "installer/win/staging/"
93+
}
94+
]
95+
},
96+
// FIXME: see stage-mac task issues with copying .app bundles
97+
/*
98+
"mac": {
99+
"files": [
100+
{
101+
"expand" : true,
102+
"cwd" : "xcodebuild/Release/<%= build.name %>.app/",
103+
"src" : ["**"],
104+
"dest" : "installer/mac/staging/<%= build.name %>.app/"
105+
}
106+
]
107+
},
108+
*/
109+
"www": {
110+
"files": [
111+
{
112+
"dot" : true,
113+
"expand" : true,
114+
"cwd" : "<%= git.www.repo %>/src",
115+
"src" : ["**", "!**/.git*"],
116+
"dest" : "<%= build.staging %>/www/"
117+
}
118+
]
119+
},
120+
"samples": {
121+
"files": [
122+
{
123+
"dot" : true,
124+
"expand" : true,
125+
"cwd" : "<%= git.www.repo %>/samples",
126+
"src" : ["**"],
127+
"dest" : "<%= build.staging %>/samples/"
128+
}
129+
]
130+
}
131+
},
132+
"unzip": {
133+
"cef": {
134+
"src" : "<%= cef_zip %>",
135+
"dest" : "deps/cef"
136+
}
137+
},
138+
"jshint": {
139+
"all" : ["Gruntfile.js", "tasks/**/*.js"],
140+
"options": {
141+
"jshintrc" : ".jshintrc"
142+
}
143+
},
144+
"build": {
145+
"name" : "Brackets",
146+
"staging" : staging
147+
},
148+
"git": {
149+
"www": {
150+
"repo" : "../brackets", // TODO user configurable?
151+
"branch" : grunt.option("www-branch") || ""
152+
},
153+
"shell": {
154+
"repo" : ".",
155+
"branch" : grunt.option("shell-branch") || ""
156+
}
157+
},
158+
"cef": {
159+
"version" : "3.1180.823"
160+
},
161+
"node": {
162+
"version" : "0.8.20"
163+
},
164+
"npm": {
165+
"version" : "1.2.11"
166+
}
167+
});
168+
169+
grunt.loadTasks("tasks");
170+
grunt.loadNpmTasks("grunt-contrib-jshint");
171+
grunt.loadNpmTasks("grunt-contrib-copy");
172+
grunt.loadNpmTasks("grunt-contrib-clean");
173+
grunt.loadNpmTasks("grunt-curl");
174+
175+
grunt.registerTask("default", ["setup", "build"]);
176+
};

‎appshell.gyp renamed to ‎appshell.gyp.txt

Lines changed: 42 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
{
66
'variables': {
7-
'appname': 'Brackets',
87
'pkg-config': 'pkg-config',
98
'target_arch%': 'environment',
109
'chromium_code': 1,
@@ -16,6 +15,8 @@
1615
]
1716
},
1817
'includes': [
18+
# Bring in the configuration vars
19+
'appshell_config.gypi',
1920
# Bring in the source file lists for appshell.
2021
'appshell_paths.gypi',
2122
],
@@ -97,6 +98,24 @@
9798
'<@(includes_win)',
9899
'<@(appshell_sources_win)',
99100
],
101+
'copies': [
102+
{
103+
# Copy node executable to the output directory
104+
'destination': '<(PRODUCT_DIR)',
105+
'files': ['deps/node/Brackets-node.exe'],
106+
},
107+
{
108+
# Copy node server files to the output directory
109+
# The '/' at the end of the 'files' directory is very important and magically
110+
# causes 'xcopy' to get used instead of 'copy' for recursive copies.
111+
# This seems to be an undocumented feature of gyp.
112+
# Also, the ../ before the PRODUCT_DIR variable is correct. Gyp doesn't seem to
113+
# munge paths properly when copying a nested subdirectory. This seems to be
114+
# an undocumented 'feature' of gyp.
115+
'destination': '../<(PRODUCT_DIR)',
116+
'files': ['appshell/node-core/'],
117+
},
118+
],
100119
}],
101120
[ 'OS=="mac"', {
102121
'product_name': '<(appname)',
@@ -137,6 +156,26 @@
137156
'${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}'
138157
],
139158
},
159+
{
160+
# Copy the entire "node-core" directory into the same location as the "www"
161+
# directory will end up. Note that the ".." in the path is necessary because
162+
# the EXECUTABLE_FOLDER_PATH macro resolves to multiple levels of folders.
163+
'postbuild_name': 'Copy node core resources',
164+
'action': [
165+
'rsync',
166+
'-a',
167+
'./appshell/node-core/',
168+
'${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/../node-core/',
169+
],
170+
},
171+
{
172+
'postbuild_name': 'Copy node executable',
173+
'action': [
174+
'cp',
175+
'./deps/node/bin/Brackets-node',
176+
'${BUILT_PRODUCTS_DIR}/${EXECUTABLE_FOLDER_PATH}/Brackets-node',
177+
],
178+
},
140179
{
141180
# This postbuid step is responsible for creating the following
142181
# helpers:
@@ -191,12 +230,12 @@
191230
{
192231
'action_name': 'appicon',
193232
'inputs': [
194-
'appshell/res/brackets.ico',
233+
'appshell/res/appshell.ico',
195234
],
196235
'outputs': [
197236
'appshell/gtk/appicon.h',
198237
],
199-
'action': '<!(mkdir -p appshell/gtk; gdk-pixbuf-csource --name=appicon appshell/res/brackets.ico > appshell/gtk/appicon.h)',
238+
'action': '<!(mkdir -p appshell/gtk; gdk-pixbuf-csource --name=appicon appshell/res/appshell.ico > appshell/gtk/appicon.h)',
200239
#Such a hack. GYP let me do bash redirections!
201240
},
202241
],

0 commit comments

Comments
 (0)