diff -r ebdd1d769158 -r eb4f4eceada0 client/gruntfile.js --- a/client/gruntfile.js Fri Mar 18 14:15:23 2016 +0100 +++ b/client/gruntfile.js Thu Mar 31 17:12:38 2016 +0200 @@ -162,6 +162,18 @@ expand: true, cwd: 'dist', src: ['**', '!data/*', '!lib/**'], + dest: '../server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/', + filter: 'isFile' + }, { + expand: true, + cwd: 'dist/lib', + src: ['**'], + dest: '../server/python/django2/renkanmanager/static/renkanmanager/lib/', + filter: 'isFile' + }, { + expand: true, + cwd: 'dist', + src: ['**', '!data/*', '!lib/**'], dest: '../server/php/basic/public_html/static/lib/renkan/', filter: 'isFile' }, { @@ -306,6 +318,21 @@ }, }] }, + 'version-django2': { + src: ['../server/python/django2/renkanmanager/__init__.py'], + overwrite: true, + replacements: [{ + from: /^(\s*)VERSION\s*=\s*\([ \t]*\d+[ \t]*,[ \t]*\d+[ \t]*,[ \t]*\d+[ \t]*,[ \t]*\"final\"[ \t]*\,[ \t]*0[ \t]*\)[ \t]*$/m, + to: function(matchedWord, index, fullText, regexMatches) { + var array_version = grunt.config.get('setversion.version').split('.'); + var array_version_length = array_version.length; + for(let i=0;i<3-array_version_length;i++) { + array_version.push('0'); + } + return regexMatches[0]+"VERSION = (" + array_version.join(', ') + ", \"final\", 0)"; + }, + }] + }, }, }); @@ -349,7 +376,7 @@ grunt.registerTask('dev', ['base', 'connect:server', 'watch']); grunt.registerTask('set-version', function(version) { grunt.config.set('setversion.version', version); - grunt.task.run(['replace:version-bower-package', 'replace:version-gradle', 'replace:version-maven', 'replace:version-django']); + grunt.task.run(['replace:version-bower-package', 'replace:version-gradle', 'replace:version-maven', 'replace:version-django', 'replace:version-django2']); });