Skip to content

Commit

Permalink
Update for release 0.1.3-snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdjackson
cdjackson committed Jun 20, 2014
1 parent e523d77 commit 035373a
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 38 deletions.
58 changes: 29 additions & 29 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,159 +17,159 @@ module.exports = function (grunt) {
expand: true,
flatten: true,
src: ['app/*.js'],
dest: 'build/webapps/habmin/app/'
dest: 'out/webapps/habmin/app/'
},
automation: {
expand: false,
flatten: true,
src: ['app/automation/*.js'],
dest: 'build/webapps/habmin/app/automation/automation.js'
dest: 'out/webapps/habmin/app/automation/automation.js'
},
config: {
expand: false,
flatten: true,
src: ['app/config/*.js'],
dest: 'build/webapps/habmin/app/config/config.js'
dest: 'out/webapps/habmin/app/config/config.js'
},
graph: {
expand: false,
flatten: true,
src: ['app/graph/*.js'],
dest: 'build/webapps/habmin/app/graph/graph.js'
dest: 'out/webapps/habmin/app/graph/graph.js'
},
language: {
expand: false,
flatten: true,
src: ['app/language/*.js'],
dest: 'build/webapps/habmin/app/language/language.js'
dest: 'out/webapps/habmin/app/language/language.js'
},
system: {
expand: false,
flatten: true,
src: ['app/system/*.js'],
dest: 'build/webapps/habmin/app/system/system.js'
dest: 'out/webapps/habmin/app/system/system.js'
},
jsfiles: {
expand: true,
flatten: true,
src: ['js/jsprintf.js', 'js/moment.js', 'js/highcharts.js', 'js/highcharts-more.js', 'js/jit.js', 'js/ext-all.js', 'js/jquery.min.js', 'js/jquery.atmosphere.js'],
dest: 'build/webapps/habmin/js/'
dest: 'out/webapps/habmin/js/'
},
extuxblockly: {
expand: true,
flatten: true,
src: ['js/extux/blockly/*.js'],
dest: 'build/webapps/habmin/js/extux/blockly'
dest: 'out/webapps/habmin/js/extux/blockly'
},
extuxgrid: {
expand: true,
flatten: true,
src: ['js/extux/grid/*.js'],
dest: 'build/webapps/habmin/js/extux/grid'
dest: 'out/webapps/habmin/js/extux/grid'
},
extuxeditor: {
expand: true,
flatten: true,
src: ['js/extux/aceeditor/*.js'],
dest: 'build/webapps/habmin/js/extux/aceeditor/'
dest: 'out/webapps/habmin/js/extux/aceeditor/'
},
extuxace: {
expand: true,
flatten: true,
src: ['js/extux/aceeditor/ace/*.js'],
dest: 'build/webapps/habmin/js/extux/aceeditor/ace/'
dest: 'out/webapps/habmin/js/extux/aceeditor/ace/'
},
extuxnotification: {
expand: true,
flatten: true,
src: ['js/extux/notification/*.js'],
dest: 'build/webapps/habmin/js/extux/notification/'
dest: 'out/webapps/habmin/js/extux/notification/'
},
extuxstatusbar: {
expand: true,
flatten: true,
src: ['js/extux/statusbar/*.js'],
dest: 'build/webapps/habmin/js/extux/statusbar/'
dest: 'out/webapps/habmin/js/extux/statusbar/'
}

},
copy: {
images: {
expand: true,
src: ['images/**'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
addons: {
expand: true,
src: ['addons/**'],
dest: 'build/'
dest: 'out/'
},
xml: {
expand: true,
src: ['openhab/**'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
language: {
expand: true,
src: ['app/language/*.json'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
resourceimg: {
expand: true,
src: ['resources/ext-theme-classic/images/**'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
statusbar: {
expand: true,
src: ['js/extux/statusbar/images/**'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
blocklymedia: {
expand: true,
src: ['js/extux/blockly/media/**'],
dest: 'build/webapps/habmin/js/extux/blockly/media'
dest: 'out/webapps/habmin/'
},
blocklymsg: {
expand: true,
src: ['js/extux/blockly/msg/**'],
dest: 'build/webapps/habmin/js/extux/blockly/msg'
dest: 'out/webapps/habmin/'
}
},
cssmin: {
habmin: {
expand: true,
src: ['app/*.css'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
statusbar: {
expand: true,
src: ['js/extux/statusbar/css/*.css'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
resourcecss: {
expand: true,
src: ['resources/css/**/*-all.css'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
}
},
htmlmin: {
index: {
expand: true,
src: ['index.html'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
},
chart: {
expand: true,
src: ['chart.html'],
dest: 'build/webapps/habmin/'
dest: 'out/webapps/habmin/'
}
},
'json-minify': {
language: {
files: 'build/webapps/habmin/app/language/*.json'
files: 'out/webapps/habmin/app/language/*.json'
},
blocklymsg: {
files: 'build/webapps/habmin/js/extjs/blockly/msg/*.json'
files: 'out/webapps/habmin/js/extjs/blockly/msg/*.json'
}
},
compress: {
Expand All @@ -179,7 +179,7 @@ module.exports = function (grunt) {
archive: 'release/habmin.zip'
},
expand: true,
cwd: 'build/',
cwd: 'out/',
src: ['**/*']
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Ext.require([
]
);

var versionGUI = "0.1.2-snapshot";
var versionGUI = "0.1.3-snapshot";
var versionJAR;
var gitRepoLink = "https://api.github.com/repos/cdjackson/HABmin/releases";

Expand Down
17 changes: 9 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@
"grunt": "~0.4.2"
},
"devDependencies": {
"grunt-contrib-cssmin": "*",
"grunt-contrib-copy": "*",
"grunt-contrib-htmlmin": "*",
"grunt-htmlhint": "*",
"grunt-xmlmin": "*",
"grunt-json-minify": "*",
"grunt-contrib-uglify": "*",
"grunt-contrib-compress": "*"
"grunt-contrib-cssmin": "*",
"grunt-contrib-copy": "*",
"grunt-contrib-htmlmin": "*",
"grunt-htmlhint": "*",
"grunt-xmlmin": "*",
"grunt-json-minify": "*",
"grunt-contrib-uglify": "*",
"grunt-contrib-compress": "*",
"grunt": "~0.4.5"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down

0 comments on commit 035373a

Please sign in to comment.