diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-04-10 13:03:30 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-04-10 13:03:30 +0700 |
| commit | 3612f72740b56204ee0d3563171a2c0209c3694c (patch) | |
| tree | c917d935468560aa0ed20a737e4e86acba3b8c0a /build | |
| parent | 34cda077348a5af1f9ec85b60803bb067ef33d38 (diff) | |
| download | aspectj-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')
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | build/scripts/compileTest.sh | 2 | ||||
| -rw-r--r-- | build/scripts/jikesInc.sh | 2 | ||||
| -rw-r--r-- | build/scripts/makeAspectjtoolsLstFile.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/build/build.xml b/build/build.xml index 68405e117..49b5b1979 100644 --- a/build/build.xml +++ b/build/build.xml @@ -566,7 +566,7 @@ To use testing client jar in tests, </jar> <!-- missing from this are the jdtDepends.jar src files --> - <unzip dest="${aj.src.dir}/jdtsrc" src="${aspectj.modules.dir}/libx/jdtcore-aj/jdtcore-for-aspectj-src.zip"/> + <unzip dest="${aj.src.dir}/jdtsrc" src="${aspectj.modules.dir}/lib/jdtcore-aj/jdtcore-for-aspectj-src.zip"/> <!-- ajde/ajde.core/ajdoc/asm/bridge/loadtime/org.aspectj.ajdt.core/taskdefs/util/weaver5 --> <jar destfile="${aj.src.dir}/aspectjtools${build.version}-src.jar"> <fileset dir="${aj.src.dir}/jdtsrc"> 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=";" |