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/05/19 08:28:24 UTC
[1/2] git commit: [flex-falcon] [refs/heads/develop] - - Made the
MavenTestAdapter also look into environment variables
Repository: flex-falcon
Updated Branches:
refs/heads/develop 87ceb80b4 -> 177ec8e21
- Made the MavenTestAdapter also look into environment variables
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a5c91186
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a5c91186
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a5c91186
Branch: refs/heads/develop
Commit: a5c911861e95090da63ba3c9ef2b33f5bed51528
Parents: 87ceb80
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu May 19 10:27:42 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu May 19 10:27:42 2016 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/flex/utils/MavenTestAdapter.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a5c91186/compiler-build-tools/src/main/java/org/apache/flex/utils/MavenTestAdapter.java
----------------------------------------------------------------------
diff --git a/compiler-build-tools/src/main/java/org/apache/flex/utils/MavenTestAdapter.java b/compiler-build-tools/src/main/java/org/apache/flex/utils/MavenTestAdapter.java
index 457249d..81da0c8 100644
--- a/compiler-build-tools/src/main/java/org/apache/flex/utils/MavenTestAdapter.java
+++ b/compiler-build-tools/src/main/java/org/apache/flex/utils/MavenTestAdapter.java
@@ -75,7 +75,10 @@ public class MavenTestAdapter implements ITestAdapter {
// TODO: Return a reference to the player debugger executable, depending on the current platform.
String FLASHPLAYER_DEBUGGER = System.getProperty("FLASHPLAYER_DEBUGGER", null);
if(FLASHPLAYER_DEBUGGER == null || FLASHPLAYER_DEBUGGER.length() == 0) {
- throw new RuntimeException("You have to specify the location of the flash debug player executable.");
+ FLASHPLAYER_DEBUGGER = System.getenv("FLASHPLAYER_DEBUGGER");
+ if(FLASHPLAYER_DEBUGGER == null || FLASHPLAYER_DEBUGGER.length() == 0) {
+ throw new RuntimeException("You have to specify the location of the flash debug player executable.");
+ }
}
return new File(FLASHPLAYER_DEBUGGER);
/*return getDependency("com.adobe.flash.runtime", "player-debugger",
[2/2] git commit: [flex-falcon] [refs/heads/develop] - - Removed the
usage of the generated manifests in the build
Posted by cd...@apache.org.
- Removed the usage of the generated manifests in the build
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/177ec8e2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/177ec8e2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/177ec8e2
Branch: refs/heads/develop
Commit: 177ec8e214d6b0d7a473e1c60b07758e9d23ed05
Parents: a5c9118
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Thu May 19 10:28:06 2016 +0200
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Thu May 19 10:28:06 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java | 4 ++--
.../src/main/resources/META-INF/plexus/components.xml | 3 ---
2 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/177ec8e2/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
index 3bffef1..0b8b9df 100644
--- a/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
+++ b/flexjs-maven-plugin/src/main/java/org/apache/flex/maven/flexjs/CompileAppMojo.java
@@ -100,7 +100,7 @@ public class CompileAppMojo
/**
* @return list of the explicitly defined as well as the automatically detected namespaces.
*/
- @Override
+ /*@Override
@SuppressWarnings("unchecked")
protected Namespace[] getNamespaces() {
File namespaceDir = new File(outputDirectory, namespaceDirectory);
@@ -142,7 +142,7 @@ public class CompileAppMojo
}
}
return super.getNamespaces();
- }
+ }*/
@Override
protected boolean includeLibrary(Artifact library) {
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/177ec8e2/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index 384e3b3..477a2bb 100644
--- a/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/flexjs-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -75,9 +75,6 @@
<lifecycle>
<id>default</id>
<phases>
- <generate-resources>
- org.apache.flex.flexjs.compiler:flexjs-maven-plugin:generate-manifests
- </generate-resources>
<process-resources>
org.apache.maven.plugins:maven-resources-plugin:resources
</process-resources>