Skip to content

Commit

Permalink
Bumps version to 2.0.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmcclure committed Aug 12, 2013
1 parent e7b1ed0 commit d3f44f3
Show file tree
Hide file tree
Showing 8 changed files with 67 additions and 81 deletions.
64 changes: 61 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-jasmine');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-shell');

var paths = grunt.file.readJSON('./paths.json');
var pkg = grunt.file.readJSON('./package.json')

grunt.initConfig({

Expand Down Expand Up @@ -67,7 +69,7 @@ module.exports = function(grunt) {
},

build_chosen: {
command: 'npm install && grunt build',
command: 'npm install && bundle install && grunt build',
options: {
execOptions: {
cwd: paths.build.chosen
Expand Down Expand Up @@ -172,8 +174,9 @@ module.exports = function(grunt) {
paths.jasmine+'/fixtures/*.html',
paths.jasmine+'/fixtures/*.xml'
],
images: './views/shared/css/img',
bower: './bower_components'
images: './views/shared/css/img',
bower: './bower_components',
packages: './pkg'
},

concat: {
Expand Down Expand Up @@ -365,6 +368,55 @@ module.exports = function(grunt) {

},

compress: {

dist: {
options: {
archive: 'pkg/Neatline-'+pkg.version+'.zip'
},
dest: 'Neatline/',
src: [

'**',

// GIT
'!.git/**',

// BOWER
'!bower.json',
'!bower_components/**',

// NPM
'!package.json',
'!node_modules/**',

// COMPOSER
'!composer.json',
'!composer.lock',
'!vendor/**',

// RUBY
'!Gemfile',
'!Gemfile.lock',
'!Rakefile',

// GRUNT
'!.grunt/**',
'!Gruntfile.js',
'!paths.json',

// DIST
'!version',
'!pkg/**',

// TESTS
'!tests/**'

]
}

},

jasmine: {

options: {
Expand Down Expand Up @@ -484,4 +536,10 @@ module.exports = function(grunt) {
'jasmine'
]);

// Spawn release package.
grunt.registerTask('package', [
'clean:packages',
'compress'
]);

};
72 changes: 0 additions & 72 deletions Rakefile

This file was deleted.

2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Neatline"
, "version": "2.0.3"
, "version": "2.0.4"
, "dependencies": {

"jquery": ">= 1.8.3"
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Neatline"
, "version": "2.0.3"
, "version": "2.0.4"
, "private": false
, "devDependencies": {
"grunt": ">= 0.4.0"
Expand All @@ -13,6 +13,7 @@
, "grunt-contrib-jasmine": "0.4.2"
, "grunt-contrib-connect": ">= 0.1.2"
, "grunt-contrib-copy": ">= 0.4.0"
, "grunt-contrib-compress": ">= 0.4.0"
, "grunt-shell": ">= 0.2.0"
}
}
2 changes: 1 addition & 1 deletion plugin.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ support_link="https://github.com/scholarslab/Neatline"
license="Apache License, Version 2.0"
omeka_minimum_version="2.0"
omeka_target_version="2.0"
version="2.0.3"
version="2.0.4"
per_page="50"
1 change: 0 additions & 1 deletion version

This file was deleted.

2 changes: 1 addition & 1 deletion views/shared/css/payloads/neatline-editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion views/shared/javascripts/payloads/ckeditor/ckeditor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d3f44f3

Please sign in to comment.