diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-10-26 00:25:01 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2012-11-27 09:28:54 -0800 |
commit | a56246f3f69d60541b276ca91e15c3bc24bb79e2 (patch) | |
tree | 5bd67c81b8687fb8d7ceced67a0bec047a7ae4e8 /recipes-core/ecj | |
parent | 6503766d83584f9a067d1dd6c85f4d4f8adf651b (diff) | |
download | meta-java-a56246f3f69d60541b276ca91e15c3bc24bb79e2.tar.gz |
libecj-bootstrap,junit: Tweak to fix rebuild issues
When rebuilding in already built tree we have these
issues where a file is already deleted first time but
rm fails on reexecution. This patch adds checks for
such cases so that rebuilds are guarnteed
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-core/ecj')
-rw-r--r-- | recipes-core/ecj/libecj-bootstrap.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc index 4f85ba9..9e1cc1d 100644 --- a/recipes-core/ecj/libecj-bootstrap.inc +++ b/recipes-core/ecj/libecj-bootstrap.inc | |||
@@ -25,17 +25,18 @@ do_unpackpost() { | |||
25 | fi | 25 | fi |
26 | 26 | ||
27 | # Remove crap. | 27 | # Remove crap. |
28 | rm about.html build.xml | 28 | rm -f about.html build.xml |
29 | rm -rf META-INF | 29 | rm -rf META-INF |
30 | 30 | ||
31 | # Move source into separate subdir. | 31 | # Move source into separate subdir. |
32 | mv org source/ | 32 | if [ -d org ]; then |
33 | 33 | mv org source/ | |
34 | fi | ||
34 | # Remove stuff unneeded for the bootstrap compiler. | 35 | # Remove stuff unneeded for the bootstrap compiler. |
35 | rm -rf source/org/eclipse/jdt/internal/compiler/apt | 36 | rm -rf source/org/eclipse/jdt/internal/compiler/apt |
36 | rm -rf source/org/eclipse/jdt/internal/compiler/tool | 37 | rm -rf source/org/eclipse/jdt/internal/compiler/tool |
37 | rm -rf source/org/eclipse/jdt/internal/antadapter | 38 | rm -rf source/org/eclipse/jdt/internal/antadapter |
38 | rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java | 39 | rm -f source/org/eclipse/jdt/core/JDTCompilerAdapter.java |
39 | 40 | ||
40 | # Make a copy of the remaining source to get the embedded | 41 | # Make a copy of the remaining source to get the embedded |
41 | # resources. | 42 | # resources. |