aboutsummaryrefslogtreecommitdiffstats
path: root/build/scripts
diff options
context:
space:
mode:
authorAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-10 13:03:30 +0700
committerAlexander Kriegisch <Alexander@Kriegisch.name>2021-04-10 13:03:30 +0700
commit3612f72740b56204ee0d3563171a2c0209c3694c (patch)
treec917d935468560aa0ed20a737e4e86acba3b8c0a /build/scripts
parent34cda077348a5af1f9ec85b60803bb067ef33d38 (diff)
downloadaspectj-3612f72740b56204ee0d3563171a2c0209c3694c.tar.gz
aspectj-3612f72740b56204ee0d3563171a2c0209c3694c.zip
Switch from 'libx' to 'lib', delete all obsolete binaries
Because 'cd lib && mvn compile' can now download and (un)zip many previously SCM-committed third-party dependencies, the following 'lib' subdirectories have been deleted: - ant - asm - commons - jarjar - junit - regexp - saxon This one is new (but not stored in SCM): - jdtcore-aj For each of them, there now is a .gitignore entry, so as to prevent developers from accidentally committing the downloaded binaries again. Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'build/scripts')
-rw-r--r--build/scripts/compileTest.sh2
-rw-r--r--build/scripts/jikesInc.sh2
-rw-r--r--build/scripts/makeAspectjtoolsLstFile.sh2
3 files changed, 3 insertions, 3 deletions
diff --git a/build/scripts/compileTest.sh b/build/scripts/compileTest.sh
index f6a5b3a17..e86304310 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 libx/jdtcore-aj/jdtcore-for-aspectj.jar"
+libs="lib/ant/lib/ant.jar lib/bcel/bcel.jar lib/jdtcore-aj/jdtcore-for-aspectj.jar"
classesDir="$ajdir/classes"
ajc110=$aj110/bin/ajc
diff --git a/build/scripts/jikesInc.sh b/build/scripts/jikesInc.sh
index 209aeadfc..3c8b1a54f 100644
--- a/build/scripts/jikesInc.sh
+++ b/build/scripts/jikesInc.sh
@@ -14,7 +14,7 @@ ajdir=`cd "$ajdir"; pwd`
ajdir=`echo "$ajdir" | sed 's|/cygdrive/\([a-zA-Z]\)/|\1:/|'`
allfiles="$ajdir/allfiles.lst"
srcdirs="ajbrowser ajde asm bridge org.aspectj.ajdt.core runtime taskdefs util weaver"
-libs="lib/ant/lib/ant.jar lib/bcel/bcel.jar libx/jdtcore-aj/jdtcore-for-aspectj.jar"
+libs="lib/ant/lib/ant.jar lib/bcel/bcel.jar lib/jdtcore-aj/jdtcore-for-aspectj.jar"
classesDir="$ajdir/classes"
diff --git a/build/scripts/makeAspectjtoolsLstFile.sh b/build/scripts/makeAspectjtoolsLstFile.sh
index 9ed7d8ad3..5c453ef06 100644
--- a/build/scripts/makeAspectjtoolsLstFile.sh
+++ b/build/scripts/makeAspectjtoolsLstFile.sh
@@ -96,7 +96,7 @@ getInjars() {
cp=""
sep=""
for i in "$1" ../lib/bcel/bcel.jar \
- ../libx/jdtcore-aj/jdtcore-for-aspectj.jar \
+ ../lib/jdtcore-aj/jdtcore-for-aspectj.jar \
; do
cp="${cp}${sep}`canonicalPath "$i"`"
[ -z "${sep}" ] && sep=";"