aboutsummaryrefslogtreecommitdiffstats
path: root/build/scripts/compileTest.sh
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-09 13:55:33 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-09 13:55:33 +0700
commitfe91fe26245d1f20b9ee1b4bb163969a89993a3f (patch)
treea006f835e521a96e5f21d770ae7c5702797c605b /build/scripts/compileTest.sh
parentd98f01fb7e8f275395214f78d64e03733e6b3970 (diff)
downloadaspectj-fe91fe26245d1f20b9ee1b4bb163969a89993a3f.tar.gz
aspectj-fe91fe26245d1f20b9ee1b4bb163969a89993a3f.zip
Replace JDT Core system dependency by deployed one
Get rid of system paths. Instead, rely on JDT Core Shadows to deploy both binary and source JARs to GitHub Packages. The former module directory was deleted completely. Instead, the JARs are redundantly copied into 'libs/jdtcore-aj' in order to be found there by tests and other Ant scripts. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'build/scripts/compileTest.sh')
-rw-r--r--build/scripts/compileTest.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/scripts/compileTest.sh b/build/scripts/compileTest.sh
index 42d9281da..f6a5b3a17 100644
--- a/build/scripts/compileTest.sh
+++ b/build/scripts/compileTest.sh
@@ -22,7 +22,7 @@ ajdir=`echo "$ajdir" | sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|'`
allfiles="$ajdir/allfiles.lst"
onefile="$ajdir/onefile.lst"
srcdirs="ajbrowser ajde asm bridge org.aspectj.ajdt.core runtime taskdefs util weaver"
-libs="lib/ant/lib/ant.jar lib/bcel/bcel.jar org.eclipse.jdt.core/jdtcore-for-aspectj.jar"
+libs="lib/ant/lib/ant.jar lib/bcel/bcel.jar libx/jdtcore-aj/jdtcore-for-aspectj.jar"
classesDir="$ajdir/classes"
ajc110=$aj110/bin/ajc
@@ -63,9 +63,9 @@ for compiler in "$jdk14"/bin/javac "$jdk13"/bin/javac "$ajc110" "$ajc111" "$jike
cp="$aj110/lib/aspectjrt.jar$classpath"
fi
echo "##################################### $compiler $cp"
- start=`date +%s`
+ start=`date +%s`
$compiler \
- -d "$classesDir" -classpath "$cp" @"$argfile"
+ -d "$classesDir" -classpath "$cp" @"$argfile"
end=`date +%s`
duration=`expr $end - $start`
echo "$duration ($start - $end) # $compiler"