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/03/19 18:13:56 UTC
[1/3] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Fixed a problem causing the test to fail on windows machines when running
the tests with maven.
Repository: flex-falcon
Updated Branches:
refs/heads/feature/maven-migration 81d2994e5 -> 56b4353a2
Fixed a problem causing the test to fail on windows machines when running the tests with maven.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/63f75cf4
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/63f75cf4
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/63f75cf4
Branch: refs/heads/feature/maven-migration
Commit: 63f75cf46325835dc12d5f8a8c30401e87d52391
Parents: da24e60
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 17:53:32 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 17:53:32 2016 +0100
----------------------------------------------------------------------
compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/63f75cf4/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
----------------------------------------------------------------------
diff --git a/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java b/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
index ae45eda..9e87e3b 100644
--- a/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
+++ b/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
@@ -28,6 +28,7 @@ import org.apache.commons.io.FilenameUtils;
import java.io.*;
import java.util.ArrayList;
import java.util.List;
+import java.util.regex.Matcher;
/**
* Created by christoferdutz on 23.02.16.
@@ -131,7 +132,7 @@ public class MavenTestAdapter implements ITestAdapter {
private File getDependency(String groupId, String artifactId, String version, String type, String classifier) {
String dependencyPath = System.getProperty("mavenLocalRepoDir") + File.separator +
- groupId.replaceAll("\\.", File.separator) + File.separator + artifactId + File.separator + version +
+ groupId.replaceAll("\\.", Matcher.quoteReplacement(File.separator)) + File.separator + artifactId + File.separator + version +
File.separator + artifactId + "-" + version + ((classifier != null) ? "-" + classifier : "") + "." +
type;
File dependency = new File(dependencyPath);
[3/3] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Merge branches 'develop' and 'feature/maven-migration' of
https://git-wip-us.apache.org/repos/asf/flex-falcon into
feature/maven-migration
Posted by cd...@apache.org.
Merge branches 'develop' and 'feature/maven-migration' of https://git-wip-us.apache.org/repos/asf/flex-falcon into feature/maven-migration
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/56b4353a
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/56b4353a
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/56b4353a
Branch: refs/heads/feature/maven-migration
Commit: 56b4353a26ad6aa6a575f0e875202442fc61c7f8
Parents: 81d2994 00c0b41
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 18:13:42 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 18:13:42 2016 +0100
----------------------------------------------------------------------
compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: [flex-falcon] [refs/heads/feature/maven-migration]
- Added a check to throw a meaningfull exception if no FLASHPLAYER_DEBUGGER
environment variable is set.
Posted by cd...@apache.org.
Added a check to throw a meaningfull exception if no FLASHPLAYER_DEBUGGER environment variable is set.
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/00c0b415
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/00c0b415
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/00c0b415
Branch: refs/heads/feature/maven-migration
Commit: 00c0b4153eb391450cb6f0bed371d569c87dd675
Parents: 63f75cf
Author: Christofer Dutz <ch...@codecentric.de>
Authored: Sat Mar 19 18:12:52 2016 +0100
Committer: Christofer Dutz <ch...@codecentric.de>
Committed: Sat Mar 19 18:12:52 2016 +0100
----------------------------------------------------------------------
compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/00c0b415/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
----------------------------------------------------------------------
diff --git a/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java b/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
index 9e87e3b..457249d 100644
--- a/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
+++ b/compiler.tests/src/org/apache/flex/utils/MavenTestAdapter.java
@@ -74,6 +74,9 @@ public class MavenTestAdapter implements ITestAdapter {
// TODO: If the archive isn't unpacked, unpack it.
// 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.");
+ }
return new File(FLASHPLAYER_DEBUGGER);
/*return getDependency("com.adobe.flash.runtime", "player-debugger",
System.getProperty("flashVersion"), "zip", null);*/