Skip to content
Snippets Groups Projects
Commit 058bbb3a authored by Jan Mach's avatar Jan Mach
Browse files

Removed package version autoincrementation feature from Grunt.

While it was usefull in the past, it makes much more sense to force developer to manually increment package version number to have more control. (Redmine issue: #3387)
parent b7b1578e
No related branches found
No related tags found
No related merge requests found
......@@ -12,19 +12,19 @@ module.exports = function(grunt) {
function version() {
if (distribution == 'development') {
return '<%= meta.version %>.' + buildnumber;
return '<%= pkg.version %>.' + buildnumber;
}
else {
return '<%= meta.version %>'
return '<%= pkg.version %>'
}
}
function deb_package_filename() {
return '<%= meta.name %>_' + version() + '_<%= meta.architecture %>.deb';
return '<%= pkg.name %>_' + version() + '_<%= meta.architecture %>.deb';
}
function deb_package_latest_filename() {
return '<%= meta.name %>_latest_<%= meta.architecture %>.deb';
return '<%= pkg.name %>_latest_<%= meta.architecture %>.deb';
}
// Project configuration.
......@@ -136,7 +136,7 @@ module.exports = function(grunt) {
'deb-control': {
'options': {
'data': {
'package_name': '<%= meta.name %>',
'package_name': '<%= pkg.name %>',
'package_version': version(),
'package_size': '0',
'architecture': '<%= meta.architecture %>'
......@@ -242,48 +242,22 @@ module.exports = function(grunt) {
require('load-grunt-tasks')(grunt, { scope: 'devDependencies' });
require('time-grunt')(grunt);
// Subtask for incrementing current version number. There should never be
// need to launch this task manually.
grunt.registerTask('inc-version', function() {
var ver = grunt.config.get('meta.version');
var lst = ver.split(".");
lst.push(parseInt(lst.pop()) + 1)
ver = lst.join(".");
grunt.config.set('meta.version', ver);
console.log("Incremented package version string to: " + grunt.template.process(version()));
grunt.config.set('template.deb-control.options.data.package_version', grunt.template.process(version()));
});
// Subtask for displaying current version number.
grunt.registerTask('check-version', function() {
console.log("Current package version: " + grunt.template.process(version()));
});
// Save current state of metadata.
grunt.registerTask('save-meta', function() {
try {
obj = JSON.parse(JSON.stringify(grunt.config.get('meta')));
} catch (e){
grunt.log.error(e);
grunt.fail.warn("Error parsing the JSON data.", 3);
}
grunt.file.write('gruntconf.json', JSON.stringify(obj, null, 4));
console.log("Updated 'gruntconf.json' metadata file");
});
// ---------------------------------------------------------------------
// Setup custom task(s).
// ---------------------------------------------------------------------
grunt.registerTask('deb-build',
'(RUN) Build Debian packages for Mentat-ng system.',
['clean:build', 'shell:deb_archive', 'copy:deb', 'clean:subprojects', 'chmod', 'shell:dir_size', 'inc-version', 'save-meta', 'template:deb-control', 'shell:deb_build', 'clean:build']
['check-version', 'clean:build', 'shell:deb_archive', 'copy:deb', 'chmod', 'shell:dir_size', 'template:deb-control', 'shell:deb_build', 'clean:build']
);
grunt.registerTask('deb-buildbot',
'(RUN) Build Debian packages for Mentat-ng system by Buildbot automation system.',
['clean:build', 'shell:deb_archive', 'copy:deb', 'clean:subprojects', 'chmod', 'shell:dir_size', 'template:deb-control', 'shell:deb_build', 'clean:build']
['check-version', 'clean:build', 'shell:deb_archive', 'copy:deb', 'chmod', 'shell:dir_size', 'template:deb-control', 'shell:deb_build', 'clean:build']
);
grunt.registerTask('deb-scp-upload',
'(RUN) Upload latest Debian packages to repository server, development server and demo server.',
......
{
"name": "mentat-ng",
"version": "0.4.18",
"architecture": "all",
"pkg_server": "homeproj",
"pkg_location": "/var/reps/apt/certs/incoming",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment