Skip to content

Commit 50e4f9c

Browse files
author
Matt Karl
committed
Replaced appdmg external calls with grunt tasks
1 parent 2a3dfe1 commit 50e4f9c

File tree

6 files changed

+63
-61
lines changed

6 files changed

+63
-61
lines changed

installer/osx32.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

installer/osx64.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
{
2-
"name": "SpringRollStudio",
3-
"private": true,
4-
"version": "0.2.7",
5-
"dependencies": {
6-
"grunt": "^0.4.5",
7-
"grunt-contrib-copy": "^0.8.0",
8-
"grunt-contrib-jade": "^0.14.1",
9-
"grunt-exec": "^0.4.6",
10-
"grunt-node-webkit-builder": "^1.0.0",
11-
"lodash": "^3.0.0",
12-
"project-grunt": "*"
13-
}
14-
}
2+
"name": "SpringRollStudio",
3+
"private": true,
4+
"version": "0.2.7",
5+
"dependencies": {
6+
"grunt": "^0.4.5",
7+
"grunt-appdmg": "^0.3.1",
8+
"grunt-contrib-copy": "^0.8.0",
9+
"grunt-contrib-jade": "^0.14.1",
10+
"grunt-exec": "^0.4.6",
11+
"grunt-node-webkit-builder": "^1.0.0",
12+
"lodash": "^3.0.0",
13+
"project-grunt": "*"
14+
}
15+
}

tasks/aliases.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ module.exports = function(grunt)
5757
tasks.push(
5858
'exec:packagewin32',
5959
'exec:packagewin64',
60-
'exec:packageosx32',
61-
'exec:packageosx64'
60+
'appdmg:osx32',
61+
'appdmg:osx64'
6262
);
6363
}
6464
grunt.task.run(tasks);

tasks/appdmg.js

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
module.exports = {
2+
options: {
3+
"title": "<%= project.name %>",
4+
"icon": "<%= distFolder %>/assets/images/icon.icns",
5+
"background": "<%= installerDir %>/assets/background.png",
6+
"icon-size": 80
7+
},
8+
osx64: {
9+
options: {
10+
"contents": [
11+
{
12+
"x": 448,
13+
"y": 344,
14+
"type": "link",
15+
"path": "/Applications"
16+
},
17+
{
18+
"x": 192,
19+
"y": 344,
20+
"type": "file",
21+
"path": "<%= buildDir %>/<%= project.name %>/osx64/<%= project.name %>.app"
22+
}
23+
]
24+
},
25+
dest: '<%= buildDir %>/<%= project.name %>-Setup-x64.dmg'
26+
},
27+
osx32: {
28+
options: {
29+
"contents": [
30+
{
31+
"x": 448,
32+
"y": 344,
33+
"type": "link",
34+
"path": "/Applications"
35+
},
36+
{
37+
"x": 192,
38+
"y": 344,
39+
"type": "file",
40+
"path": "<%= buildDir %>/<%= project.name %>/osx32/<%= project.name %>.app"
41+
}
42+
]
43+
},
44+
dest: '<%= buildDir %>/<%= project.name %>-Setup-x32.dmg'
45+
}
46+
47+
};

tasks/exec.js

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ module.exports = {
1111
"packagewin64": {
1212
cmd: 'makensis <%= installerDir %>/win64.nsi'
1313
},
14-
"packageosx32": {
15-
cmd: 'appdmg <%= installerDir %>/osx32.json <%= buildDir %>/<%= project.name %>-Setup-x32.dmg'
16-
},
17-
"packageosx64": {
18-
cmd: 'appdmg <%= installerDir %>/osx64.json <%= buildDir %>/<%= project.name %>-Setup-x64.dmg'
19-
},
2014
"openosx32" : {
2115
cmd: 'open <%= buildDir %>/<%= project.name %>/osx32/<%= project.name %>.app'
2216
},

0 commit comments

Comments
 (0)