You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/07/23 14:46:57 UTC
git commit: [flex-utilities] [refs/heads/develop] - - Changed the
code for naming binary output files
Repository: flex-utilities
Updated Branches:
refs/heads/develop 6991e4d8b -> 80051f081
- Changed the code for naming binary output files
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/80051f08
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/80051f08
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/80051f08
Branch: refs/heads/develop
Commit: 80051f0815cd0c2595dac199a209efcce282519e
Parents: 6991e4d
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Jul 23 16:46:44 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Jul 23 16:46:44 2016 +0200
----------------------------------------------------------------------
.../apache/flex/utilities/converter/model/MavenArtifact.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/80051f08/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java
----------------------------------------------------------------------
diff --git a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java
index 018542a..c41db58 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java
+++ b/flex-maven-tools/flex-sdk-converter/converters/base/src/main/java/org/apache/flex/utilities/converter/model/MavenArtifact.java
@@ -142,9 +142,13 @@ public class MavenArtifact {
public File getBinaryTargetFile(File targetRootDirectory, String classifier) {
if((binaryArtifacts != null) && (binaryArtifacts.containsKey(classifier))) {
+ File file = binaryArtifacts.get(classifier);
+ String type = ("pom".equals(packaging)) ?
+ ((file.getName().endsWith("zip")) ? "zip" : "exe") :
+ packaging;
final String fileName = groupId.replace(".", File.separator) + File.separator + artifactId + File.separator +
version + File.separator + artifactId + "-" + version +
- (DEFAULT_CLASSIFIER.equals(classifier) ? "" : "-" + classifier) + "." + packaging;
+ (DEFAULT_CLASSIFIER.equals(classifier) ? "" : "-" + classifier) + "." + type;
return new File(targetRootDirectory, fileName);
}
return null;