flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cd...@apache.org
Subject git commit: [flex-utilities] [refs/heads/develop] - - Made the air converter deploy the adl executables individually
Date Sat, 23 Jul 2016 13:39:05 GMT
Repository: flex-utilities
Updated Branches:
  refs/heads/develop eb90937ca -> 6991e4d8b


- Made the air converter deploy the adl executables individually


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/6991e4d8
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/6991e4d8
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/6991e4d8

Branch: refs/heads/develop
Commit: 6991e4d8bc6fab285309b60184cfb060a320e553
Parents: eb90937
Author: Christofer Dutz <christofer.dutz@codecentric.de>
Authored: Sat Jul 23 15:38:47 2016 +0200
Committer: Christofer Dutz <christofer.dutz@codecentric.de>
Committed: Sat Jul 23 15:38:47 2016 +0200

----------------------------------------------------------------------
 .../utilities/converter/air/AirConverter.java   | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/6991e4d8/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
----------------------------------------------------------------------
diff --git a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
index 5360b83..d4f9350 100644
--- a/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
+++ b/flex-maven-tools/flex-sdk-converter/converters/air/src/main/java/org/apache/flex/utilities/converter/air/AirConverter.java
@@ -277,17 +277,23 @@ public class AirConverter extends BaseConverter implements Converter
{
         adl.setGroupId("com.adobe.air.runtime");
         adl.setArtifactId("adl");
         adl.setVersion(airSdkVersion);
-        adl.setPackaging("zip");
+        // We'll use pom packaging as we don't have a default artifact to download.
+        adl.setPackaging("exe");
         final File directory = new File(rootSourceDirectory, "bin");
         if (!directory.exists() || !directory.isDirectory()) {
             throw new ConverterException("Runtime directory does not exist.");
         }
-        try {
-            File adlZip = File.createTempFile("adl-" + airSdkVersion, "zip");
-            generateZip(directory.listFiles(new AirRuntimeFilter()), adlZip);
-            adl.addDefaultBinaryArtifact(adlZip);
-        } catch (IOException e) {
-            throw new ConverterException("Error creating adl zip.", e);
+        File[] adlExecutables = directory.listFiles(new AirRuntimeFilter());
+        if(adlExecutables != null) {
+            for(File adlExecutable : adlExecutables) {
+                if(adlExecutable.getName().endsWith(".exe")) {
+                    adl.addBinaryArtifact("win", adlExecutable);
+                }
+                // TODO: Check to see how it was with linux up till AIR 2.6
+                else {
+                    adl.addBinaryArtifact("mac", adlExecutable);
+                }
+            }
         }
         runtime.addDependency(adl);
         writeArtifact(adl);


Mime
View raw message