Skip to content

Commit 6635bed

Browse files
author
Matt Karl
committed
Fixed module tasks, updated flashaudioplugin file
1 parent 73cc0d7 commit 6635bed

File tree

9 files changed

+69
-23
lines changed

9 files changed

+69
-23
lines changed

‎Gruntfile.js‎

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,55 @@
11
module.exports = function(grunt)
22
{
3-
require('project-grunt')(grunt, {
3+
var _ = require('lodash');
4+
5+
var config = require('project-grunt')(grunt, {
6+
autoInit: false,
47
data: {
58
buildDir : './build',
69
installerDir : './installer',
710
}
811
});
12+
13+
// Create the tasks for building the modules
14+
// in APP mode
15+
var moduleAppTasks = [],
16+
moduleAppTasksDebug = [];
17+
18+
// Loop through the module
19+
for(var alias in config.project.modules)
20+
{
21+
var task, app = alias+'app';
22+
23+
// Use the APP uglify options
24+
task = config.uglify[app] = _.cloneDeep(config.uglify[alias]);
25+
task.options = '<%= uglify.app.options %>';
26+
27+
// Use the APP replacement options
28+
task = config.replace[app] = _.cloneDeep(config.replace[alias]);
29+
task.replacements = '<%= replace.app.replacements %>';
30+
31+
moduleAppTasks.push(
32+
'clean:'+alias,
33+
'uglify:'+app
34+
);
35+
36+
moduleAppTasksDebug.push(
37+
'clean:'+alias,
38+
'concat:'+alias,
39+
'replace:'+app
40+
);
41+
42+
// Add the less tasks if we have css
43+
if (config.less[alias])
44+
{
45+
moduleAppTasks.push('less:'+alias);
46+
moduleAppTasksDebug.push('less:'+alias+'Debug');
47+
}
48+
}
49+
50+
// Register new tasks
51+
grunt.registerTask('moduleAppTasks', moduleAppTasks);
52+
grunt.registerTask('moduleAppTasksDebug', moduleAppTasksDebug);
53+
54+
grunt.initConfig(config);
955
};

‎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.1.2",
3+
"version": "0.1.3",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",

‎deploy/index.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<head>
44
<meta charset="utf-8">
55
<title>SpringRoll Studio</title>
6-
<link href="assets/css/libraries.css?v=0.1.2" rel="stylesheet">
7-
<link href="assets/css/main.css?v=0.1.2" rel="stylesheet">
8-
<script src="assets/js/libraries.js?v=0.1.2"></script>
9-
<script src="assets/js/main.js?v=0.1.2"></script>
6+
<link href="assets/css/libraries.css?v=0.1.3" rel="stylesheet">
7+
<link href="assets/css/main.css?v=0.1.3" rel="stylesheet">
8+
<script src="assets/js/libraries.js?v=0.1.3"></script>
9+
<script src="assets/js/main.js?v=0.1.3"></script>
1010
</head>
1111
<body>
1212
<div class="modules btn-group-vertical">

‎deploy/new.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ <h1>Create New Project</h1>
135135
<label><input type="checkbox" class="module" value="components/springroll/dist/modules/interface" checked="checked"> Interface Module</label>
136136
</div>
137137
<div class="checkbox optional">
138-
<label><input type="checkbox" class="module" value="components/springroll/dist/modules/sound" checked="checked" data-bower='{"soundjs":"https://github.com/SpringRoll/SoundJS.git"}' data-libraries='["components/soundjs/lib/soundjs.min.js","components/soundjs/lib/flashplugin.min.js"]' data-libraries-debug='["components/soundjs/lib/soundjs.min.js","components/soundjs/lib/flashplugin.min.js"]'> Sound Module</label>
138+
<label><input type="checkbox" class="module" value="components/springroll/dist/modules/sound" checked="checked" data-bower='{"soundjs":"https://github.com/SpringRoll/SoundJS.git"}' data-libraries='["components/soundjs/lib/soundjs.min.js","components/soundjs/lib/flashaudioplugin.min.js"]' data-libraries-debug='["components/soundjs/lib/soundjs.min.js","components/soundjs/lib/flashaudioplugin.combined.js"]'> Sound Module</label>
139139
</div>
140140
</div>
141141
<div class="col-sm-5 col-xs-4">

‎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.1.2",
4+
"version": "0.1.3",
55
"repository": {
66
"type": "git",
77
"url": "https://github.com/SpringRoll/SpringRollStudio"

‎installer/win.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 1
7-
!define VERSIONBUILD 2
7+
!define VERSIONBUILD 3
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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "SpringRollStudio",
3-
"private": true,
4-
"version": "0.1.2",
5-
"dependencies": {
6-
"grunt": "~0.4.5",
7-
"grunt-exec": "~0.4.6",
8-
"grunt-node-webkit-builder": "^0.2.2",
9-
"lodash": "~3.0.0",
10-
"project-grunt": "*"
11-
}
12-
}
2+
"name": "SpringRollStudio",
3+
"private": true,
4+
"version": "0.1.3",
5+
"dependencies": {
6+
"grunt": "~0.4.5",
7+
"grunt-exec": "~0.4.6",
8+
"grunt-node-webkit-builder": "^0.2.2",
9+
"lodash": "~3.0.0",
10+
"project-grunt": "*"
11+
}
12+
}

‎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.1.2",
3+
"version": "0.1.3",
44
"main": [
55
"components/node-webkit-app/src/utils/UpdateChecker.js",
66
"components/node-webkit-app/src/NodeWebkitApp.js",

‎tasks/aliases.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function(grunt)
66
'uglify:app',
77
'clean:css',
88
'less:release',
9-
'moduleTasks',
9+
'moduleAppTasks',
1010
'libs',
1111
'exec:appModules',
1212
'nodewebkit'
@@ -19,7 +19,7 @@ module.exports = function(grunt)
1919
'replace:app',
2020
'clean:css',
2121
'less:development',
22-
'moduleTasksDebug',
22+
'moduleAppTasksDebug',
2323
'libs-debug',
2424
'exec:appModules',
2525
'nodewebkit'

0 commit comments

Comments
 (0)