Skip to content

Commit 36e63ac

Browse files
committed
+fix
1 parent c687ffd commit 36e63ac

File tree

7 files changed

+4523
-569
lines changed

7 files changed

+4523
-569
lines changed

lib/grunt/build.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,6 @@ module.exports = function (grunt) {
747747
variables[resourceName] = info.resources[resourceName] = JSON.stringify(result);
748748
});
749749

750-
751750
config.find("//PropertyGroup/Dependencies/Attachment").forEach(function (attachment, i) {
752751
var attachmentName = attachment.getAttribute("Name") || ("$" + i);
753752
var result = loadAttachment(config, attachment, info);
@@ -1084,7 +1083,7 @@ module.exports = function (grunt) {
10841083

10851084
var srcFiles = meta.data;
10861085

1087-
for (i = 0; i < srcFiles.length; ++i) {
1086+
for (var i = 0; i < srcFiles.length; ++i) {
10881087
if (!isDev()) {
10891088
copy(srcFiles[i].src, srcFiles[i].dst); //записываем файл в destFolder
10901089
}

lib/grunt/utils.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module.exports = {
5555

5656
function getTagOfCurrentCommit() {
5757
var gitTagResult = shell.exec('git describe --exact-match', { silent: true });
58-
var gitTagOutput = gitTagResult.output.trim();
58+
var gitTagOutput = gitTagResult.stdout.trim();
5959
var branchVersionPattern = new RegExp(package.branchVersion.replace('.', '\\.').replace('*', '\\d+'));
6060
if (gitTagResult.code === 0 && gitTagOutput.match(branchVersionPattern)) {
6161
return gitTagOutput;
@@ -71,7 +71,7 @@ module.exports = {
7171
grep = 'findstr';
7272
}
7373

74-
var tagMessage = shell.exec('git cat-file -p ' + tagName + ' | ' + grep + ' "codename"', { silent: true }).output;
74+
var tagMessage = shell.exec('git cat-file -p ' + tagName + ' | ' + grep + ' "codename"', { silent: true }).stdout;
7575
var codeName = tagMessage && tagMessage.match(/codename\((.*)\)/)[1];
7676
if (!codeName) {
7777
throw new Error("Could not extract release code name. The message of tag " + tagName +
@@ -81,7 +81,7 @@ module.exports = {
8181
}
8282

8383
function getSnapshotVersion() {
84-
var oldTags = shell.exec('git tag -l v' + package.branchVersion, { silent: true }).output.trim().split('\n');
84+
var oldTags = shell.exec('git tag -l v' + package.branchVersion, { silent: true }).stdout.trim().split('\n');
8585
// ignore non semver versions.
8686
oldTags = oldTags.filter(function (version) {
8787
return version && semver.valid(version);
@@ -102,7 +102,7 @@ module.exports = {
102102

103103
function getSnapshotSuffix() {
104104
var jenkinsBuild = process.env.TRAVIS_BUILD_NUMBER || process.env.BUILD_NUMBER || 'local';
105-
var hash = shell.exec('git rev-parse --short HEAD', { silent: true }).output.replace('\n', '');
105+
var hash = shell.exec('git rev-parse --short HEAD', { silent: true }).stdout.replace('\n', '');
106106
return 'build.' + jenkinsBuild + '+sha.' + hash;
107107
}
108108
},

0 commit comments

Comments
 (0)