Skip to content

Commit d9c6062

Browse files
committed
Merge pull request #2336 from uProxy/trevj-cloud-for-dist
enable cloud in dist build
2 parents c3f35b9 + 5a84cb2 commit d9c6062

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

Gruntfile.coffee

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ coreDistFiles = [
189189

190190
# this should always be added to arrays of files to copy last
191191
universalDistFiles = [
192-
'icons/*'
192+
'icons/**/*'
193193
'bower/webcomponentsjs/webcomponents.min.js'
194194
'bower/polymer/polymer.js'
195195

@@ -405,6 +405,9 @@ gruntConfig = {
405405
'polymer/vulcanized.{html,js}'
406406

407407
'freedom-for-chrome/freedom-for-chrome.js'
408+
409+
# for cloud social provider
410+
'forge-min/forge.min.js'
408411
].concat(coreDistFiles, universalDistFiles)
409412
dest: 'build/dist/chrome/app'
410413
}
@@ -427,6 +430,9 @@ gruntConfig = {
427430
'data/scripts/content-proxy.js'
428431

429432
'data/freedom-for-firefox/freedom-for-firefox.jsm'
433+
434+
# for cloud social provider
435+
'data/forge-min/forge.min.js'
430436
].concat(
431437
getWithBasePath(uiDistFiles, 'data'),
432438
getWithBasePath(coreDistFiles, 'data'),

src/generic_core/dist_build/freedom-module.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,14 @@
5050
"portControl": {
5151
"url": "../freedom-port-control/port-control.json",
5252
"api": "portControl"
53+
},
54+
"CLOUDPROVIDER-digitalocean": {
55+
"url": "../uproxy-lib/cloud/digitalocean/freedom-module.json",
56+
"api": "digitalocean"
57+
},
58+
"cloudinstall": {
59+
"url": "../uproxy-lib/cloud/install/freedom-module.json",
60+
"api": "cloudinstall"
5361
}
5462
},
5563
"permissions": [

0 commit comments

Comments
 (0)