You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2016/05/13 17:26:24 UTC
git commit: [flex-falcon] [refs/heads/develop] - use
external-library-path if needed
Repository: flex-falcon
Updated Branches:
refs/heads/develop af288f13b -> bf715ec10
use external-library-path if needed
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bf715ec1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bf715ec1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bf715ec1
Branch: refs/heads/develop
Commit: bf715ec103b80589d075fe043584dbdeb36bcc54
Parents: af288f1
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 13 10:22:37 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 13 10:22:37 2016 -0700
----------------------------------------------------------------------
.../internal/config/FlashBuilderConfigurator.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bf715ec1/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
----------------------------------------------------------------------
diff --git a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
index 27dfaa4..23c7a45 100644
--- a/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
+++ b/compiler/src/main/java/org/apache/flex/compiler/internal/config/FlashBuilderConfigurator.java
@@ -313,6 +313,7 @@ public class FlashBuilderConfigurator
if (!inExclude)
{
String kind = attributes.getValue("kind");
+ String linkType = attributes.getValue("linkType");
String path = attributes.getValue("path");
if (!kind.equals("4")) // not an sdk reference
{
@@ -332,12 +333,12 @@ public class FlashBuilderConfigurator
}
}
path = path.replace("${DOCUMENTS}", workspacePath);
- fbArgs.add("-library-path+=" + path);
+ fbArgs.add(linkType.equals("2") ? "-external-library-path+=" + path : "-library-path+=" + path);
}
else if (path.contains("${PROJECT_FRAMEWORKS}"))
{
path = path.replace("${PROJECT_FRAMEWORKS}", sdkdir);
- fbArgs.add("-library-path+=" + path);
+ fbArgs.add(linkType.equals("2") ? "-external-library-path+=" + path : "-library-path+=" + path);
}
else
{
@@ -348,13 +349,13 @@ public class FlashBuilderConfigurator
String parentPath = f.getParent();
f = new File(parentPath + path);
if (f.exists())
- fbArgs.add("-library-path+=" + parentPath + path);
+ fbArgs.add(linkType.equals("2") ? "-external-library-path+=" + parentPath + path : "-library-path+=" + parentPath + path);
else
- fbArgs.add("-library-path+=" + path);
+ fbArgs.add(linkType.equals("2") ? "-external-library-path+=" + path : "-library-path+=" + path);
}
else
- fbArgs.add("-library-path+=" + contextPath + "/" + path);
+ fbArgs.add(linkType.equals("2") ? "-external-library-path+=" + contextPath + "/" + path : "-library-path+=" + contextPath + "/" + path);
}
}
}