Skip to content

Commit 18238d6

Browse files
author
Matt Karl
committed
Fixed versions task, removed states modules
1 parent a9fe4e2 commit 18238d6

File tree

8 files changed

+30
-31
lines changed

8 files changed

+30
-31
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.1.1",
3+
"version": "0.1.2",
44
"private": true,
55
"dependencies": {
66
"jqueryui": "*",

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

‎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.1" rel="stylesheet">
7-
<link href="assets/css/main.css?v=0.1.1" rel="stylesheet">
8-
<script src="assets/js/libraries.js?v=0.1.1"></script>
9-
<script src="assets/js/main.js?v=0.1.1"></script>
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>
1010
</head>
1111
<body>
1212
<div class="modules btn-group-vertical">

‎deploy/new.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ <h1>Create New Project</h1>
139139
</div>
140140
</div>
141141
<div class="col-sm-5 col-xs-4">
142-
<div class="checkbox optional no-native">
142+
<!-- <div class="checkbox optional no-native">
143143
<label><input type="checkbox" class="module" value="components/springroll/dist/modules/states" checked="checked"> States Module</label>
144-
</div>
144+
</div> -->
145145
<div class="checkbox optional">
146146
<label><input type="checkbox" class="module" value="components/springroll/dist/modules/tasks" checked="checked"> Tasks Module</label>
147147
</div>

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

‎tasks/overrides/version.js‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
module.exports = {
22
options: {
3-
files : {
4-
'deploy/package.json' : 'version',
5-
'installer/win.nsi' : function(contents, version) {
3+
'deploy/package.json' : 'version',
4+
'installer/win.nsi' : function(contents, version) {
65

7-
// Strip off any "-alpha" "-beta" "-rc" etc
8-
var extra = version.lastIndexOf('-');
9-
var parts = (extra > -1 ? version.substr(0, extra) : version).split('.');
6+
// Strip off any "-alpha" "-beta" "-rc" etc
7+
var extra = version.lastIndexOf('-');
8+
var parts = (extra > -1 ? version.substr(0, extra) : version).split('.');
109

11-
// Replace in the file contents and return
12-
return contents.replace(/(\!define VERSIONMAJOR) [0-9]+/, "$1 " + parts[0])
13-
.replace(/(\!define VERSIONMINOR) [0-9]+/, "$1 " + parts[1])
14-
.replace(/(\!define VERSIONBUILD) [0-9]+/, "$1 " + parts[2]);
15-
}
10+
// Replace in the file contents and return
11+
return contents.replace(/(\!define VERSIONMAJOR) [0-9]+/, "$1 " + parts[0])
12+
.replace(/(\!define VERSIONMINOR) [0-9]+/, "$1 " + parts[1])
13+
.replace(/(\!define VERSIONBUILD) [0-9]+/, "$1 " + parts[2]);
1614
}
1715
}
1816
};

0 commit comments

Comments
 (0)