Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #156 from mbfgit/fixZip
Fix needZip PackageTask when using archiveChangeDir.
  • Loading branch information
mde committed Sep 7, 2012
2 parents cbeed6f + 0bce828 commit 540b620
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions lib/package_task.js
Expand Up @@ -223,19 +223,17 @@ PackageTask.prototype = new (function () {
task('repackage', ['package']);

task('clobberPackage', function () {
jake.exec(['rm -fr ' + self.packageDir], function () {
complete();
});
}, {async: true});
jake.rmRf(self.packageDir);
});

desc('Remove the package');
task('clobber', ['clobberPackage']);

for (var p in _compressOpts) {
if (this['need' + p]) {
(function (p) {
var filename = self.packageDir + '/' + self.packageName() +
_compressOpts[p].ext;
var filename = path.resolve(self.packageDir + '/' + self.packageName() +
_compressOpts[p].ext);
compressTaskArr.push(filename);

file(filename, [packageDirPath], function () {
Expand All @@ -247,19 +245,23 @@ PackageTask.prototype = new (function () {

// Move into the package dir to compress (see below, after
// exec)
process.chdir(self.packageDir);
var chdir = self.packageDir;

cmd = self[opts.cmd + 'Command'];
cmd += ' -' + opts.flags;
if (opts.cmd == 'jar' && self.manifestFile) {
cmd += 'm';
}
cmd += ' ' + self.packageName() + opts.ext;
cmd += ' ' + filename;
if (opts.cmd == 'jar' && self.manifestFile) {
cmd += ' ' + self.manifestFile;
}
if (self.archiveChangeDir) {
cmd += ' -C ' + self.archiveChangeDir;
if(opts.cmd === 'zip') {
chdir = path.join(chdir,self.archiveChangeDir);
} else {
cmd += ' -C ' + self.archiveChangeDir;
}
}
if (self.archiveContentDir) {
cmd += ' ' + self.archiveContentDir;
Expand All @@ -268,6 +270,7 @@ PackageTask.prototype = new (function () {
cmd += ' ' + self.packageName();
}

process.chdir(chdir);
exec(cmd, function (err, stdout, stderr) {
if (err) { throw err; }

Expand Down

0 comments on commit 540b620

Please sign in to comment.