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 2015/12/28 21:00:27 UTC
[1/3] git commit: [flex-flexunit] [refs/heads/develop] - Revert
"Temporarily disabling as3 compilation to determine if that's why some unit
tests are failing"
Repository: flex-flexunit
Updated Branches:
refs/heads/develop 204da6225 -> 44c9a3da6
Revert "Temporarily disabling as3 compilation to determine if that's why some unit tests are failing"
This reverts commit 204da62253a29be5bb62e31ea941b263b52ee6d6.
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/3e15d6cd
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/3e15d6cd
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/3e15d6cd
Branch: refs/heads/develop
Commit: 3e15d6cd1b4ec26a24b772450f9b0aa2742d1801
Parents: 204da62
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 28 11:33:17 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 28 11:33:17 2015 -0800
----------------------------------------------------------------------
FlexUnit4/build.xml | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/3e15d6cd/FlexUnit4/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index 58964d6..f1d4696 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -198,9 +198,7 @@
<target name="package" depends="package-default,package-instrument,asdocs" />
<target name="package-default" depends="compile">
- <!-- Temporarily disabling as3 compilation to determine if that's why some unit tests are failing
- <copy file="${bin.loc}/${build.finalName.as3}.${build.packaging}" todir="${dist.loc}" />
- -->
+ <copy file="${bin.loc}/${build.finalName.as3}.${build.packaging}" todir="${dist.loc}" />
<copy file="${bin.loc}/${build.finalName.flex}.${build.packaging}" todir="${dist.loc}" />
</target>
@@ -223,7 +221,6 @@
</apache-deploy>
<!-- deploy as3 swc to apache-maven -->
- <!-- Temporarily disabling as3 compilation to determine if that's why some unit tests are failing
<apache-deploy
binaryFile="${bin.loc}/${build.finalName.as3}.${build.packaging}"
todir="${apache-maven.loc}/as3"
@@ -234,6 +231,5 @@
version="${build.version}"
description="${build.deploy.description}">
</apache-deploy>
- -->
</target>
</project>
\ No newline at end of file
[2/3] git commit: [flex-flexunit] [refs/heads/develop] - Revert
"Temporarily disabling as3 compilation to determine if that's why some unit
tests are failing. Then we'll restore this and change in the right place."
Posted by ah...@apache.org.
Revert "Temporarily disabling as3 compilation to determine if that's why some unit tests are failing. Then we'll restore this and change in the right place."
This reverts commit 5307819369b560c0c56977395f24546d6f626b97.
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/22fac675
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/22fac675
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/22fac675
Branch: refs/heads/develop
Commit: 22fac6757e22515dbeb3a45f95a9233cabddcbfc
Parents: 3e15d6c
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 28 11:33:37 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 28 11:33:37 2015 -0800
----------------------------------------------------------------------
FlexUnit4/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/22fac675/FlexUnit4/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index f1d4696..c12d35f 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -102,7 +102,7 @@
<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
</target>
- <target name="compile" depends="init, thirdparty-downloads, compile-flex" />
+ <target name="compile" depends="init, thirdparty-downloads, compile-flex,compile-as3,as3-linker-check" />
<target name="compile-flex">
<!-- Pull in class file list for compc -->
[3/3] git commit: [flex-flexunit] [refs/heads/develop] - try to
remove the as3 swc temporarily after it is built. The build scripts cared too
much about its existence
Posted by ah...@apache.org.
try to remove the as3 swc temporarily after it is built. The build scripts cared too much about its existence
Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/44c9a3da
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/44c9a3da
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/44c9a3da
Branch: refs/heads/develop
Commit: 44c9a3da661df67c6253273bb50a244848fb5783
Parents: 22fac67
Author: Alex Harui <ah...@apache.org>
Authored: Mon Dec 28 12:00:20 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Dec 28 12:00:20 2015 -0800
----------------------------------------------------------------------
FlexUnit4/build.xml | 5 +++++
build.xml | 3 +++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/44c9a3da/FlexUnit4/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index c12d35f..7bb3c3e 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -232,4 +232,9 @@
description="${build.deploy.description}">
</apache-deploy>
</target>
+
+ <target name="clean_as3">
+ <delete file="${bin.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
+ <delete file="${dist.loc}/${build.finalName.as3}.${build.packaging}" failonerror="false" />
+ </target>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/44c9a3da/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9d20e8c..512aff9 100644
--- a/build.xml
+++ b/build.xml
@@ -469,4 +469,7 @@ to contribute to our CI process.
<echo message="not found in anttask.classpath"/>
</target>
+ <target name="clean_as3">
+ <ant dir="FlexUnit4" target="clean_as3" />
+ </target>
</project>