Skip to content

Commit 8751a76

Browse files
author
Matt Karl
committed
Now adding librariesCopy to the springroll.json file
1 parent 27062d6 commit 8751a76

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.4",
3+
"version": "0.2.5",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",

deploy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"description": "Application for SpringRoll projects",
4-
"version": "0.2.4",
4+
"version": "0.2.5",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/SpringRoll/SpringRollStudio"

installer/win32.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# These three must be integers
55
!define VERSIONMAJOR 0
66
!define VERSIONMINOR 2
7-
!define VERSIONBUILD 4
7+
!define VERSIONBUILD 5
88
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
99
# It is possible to use "mailto:" links in here to open the email client
1010
!define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"

installer/win64.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# These three must be integers
55
!define VERSIONMAJOR 0
66
!define VERSIONMINOR 2
7-
!define VERSIONBUILD 4
7+
!define VERSIONBUILD 5
88
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
99
# It is possible to use "mailto:" links in here to open the email client
1010
!define HELPURL "https://github.com/SpringRoll/SpringRollStudio/issues"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "SpringRollStudio",
33
"private": true,
4-
"version": "0.2.4",
4+
"version": "0.2.5",
55
"dependencies": {
66
"grunt": "^0.4.5",
77
"grunt-contrib-copy": "^0.7.0",

project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "SpringRollStudio",
3-
"version": "0.2.4",
3+
"version": "0.2.5",
44
"main": [
55
"components/node-webkit-app/src/utils/UpdateChecker.js",
66
"components/node-webkit-app/src/utils/Browser.js",

src/js/new/Installer.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
var path = require('path');
88
var replace = require("replace");
99
var glob = require("glob");
10+
var _ = require('lodash');
1011
}
1112

1213
// Import classes
@@ -106,6 +107,15 @@
106107
options.librariesDebug
107108
);
108109

110+
// Either the build has librariesCopy or the options have some libraries copy
111+
if (!_.isEmpty(build.librariesCopy) || !_.isEmpty(options.librariesCopy))
112+
{
113+
build.librariesCopy = _.extend({},
114+
options.librariesCopy,
115+
build.librariesCopy
116+
);
117+
}
118+
109119
this.writeJSON(Installer.FILE, build);
110120

111121
// Replace text in the files

0 commit comments

Comments
 (0)