File tree Expand file tree Collapse file tree 7 files changed +16
-6
lines changed Expand file tree Collapse file tree 7 files changed +16
-6
lines changed Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " SpringRollStudio" ,
3
- "version" : " 0.2.4 " ,
3
+ "version" : " 0.2.5 " ,
4
4
"private" : true ,
5
5
"dependencies" : {
6
6
"jqueryui" : " *" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " SpringRollStudio" ,
3
3
"description" : " Application for SpringRoll projects" ,
4
- "version" : " 0.2.4 " ,
4
+ "version" : " 0.2.5 " ,
5
5
"repository" : {
6
6
"type" : " git" ,
7
7
"url" : " https://github.com/SpringRoll/SpringRollStudio"
Original file line number Diff line number Diff line change 4
4
# These three must be integers
5
5
!define VERSIONMAJOR 0
6
6
!define VERSIONMINOR 2
7
- !define VERSIONBUILD 4
7
+ !define VERSIONBUILD 5
8
8
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
9
9
# It is possible to use "mailto:" links in here to open the email client
10
10
!define HELPURL " https://github.com/SpringRoll/SpringRollStudio/issues"
Original file line number Diff line number Diff line change 4
4
# These three must be integers
5
5
!define VERSIONMAJOR 0
6
6
!define VERSIONMINOR 2
7
- !define VERSIONBUILD 4
7
+ !define VERSIONBUILD 5
8
8
# These will be displayed by the "Click here for support information" link in "Add/Remove Programs"
9
9
# It is possible to use "mailto:" links in here to open the email client
10
10
!define HELPURL " https://github.com/SpringRoll/SpringRollStudio/issues"
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " SpringRollStudio" ,
3
3
"private" : true ,
4
- "version" : " 0.2.4 " ,
4
+ "version" : " 0.2.5 " ,
5
5
"dependencies" : {
6
6
"grunt" : " ^0.4.5" ,
7
7
"grunt-contrib-copy" : " ^0.7.0" ,
Original file line number Diff line number Diff line change 1
1
{
2
2
"name" : " SpringRollStudio" ,
3
- "version" : " 0.2.4 " ,
3
+ "version" : " 0.2.5 " ,
4
4
"main" : [
5
5
" components/node-webkit-app/src/utils/UpdateChecker.js" ,
6
6
" components/node-webkit-app/src/utils/Browser.js" ,
Original file line number Diff line number Diff line change 7
7
var path = require ( 'path' ) ;
8
8
var replace = require ( "replace" ) ;
9
9
var glob = require ( "glob" ) ;
10
+ var _ = require ( 'lodash' ) ;
10
11
}
11
12
12
13
// Import classes
106
107
options . librariesDebug
107
108
) ;
108
109
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
+
109
119
this . writeJSON ( Installer . FILE , build ) ;
110
120
111
121
// Replace text in the files
You can’t perform that action at this time.
0 commit comments