diff options
author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-04-02 08:22:42 +0700 |
---|---|---|
committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2022-04-02 08:24:04 +0700 |
commit | 651e92a3285606537cfa47913adc17ce90bc22c8 (patch) | |
tree | e0fb94bf0758d5f2f09437aee383713220b57232 /tests | |
parent | cefa5d6bfcb92ea66e6fccd68fa922dba914a420 (diff) | |
download | aspectj-651e92a3285606537cfa47913adc17ce90bc22c8.tar.gz aspectj-651e92a3285606537cfa47913adc17ce90bc22c8.zip |
Remove AspectJ Browser (ajbrowser) code and documentation
Closes #148.
TODO: Should more AJDE stuff be removed?
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/product/ant-example.xml | 32 | ||||
-rw-r--r-- | tests/product/build-aspectj/build.xml | 1 | ||||
-rw-r--r-- | tests/product/product-test.xml | 48 |
3 files changed, 35 insertions, 46 deletions
diff --git a/tests/product/ant-example.xml b/tests/product/ant-example.xml index 1dda5c944..4f0160cd6 100644 --- a/tests/product/ant-example.xml +++ b/tests/product/ant-example.xml @@ -33,7 +33,7 @@ <!-- ========================================================================== --> <target name="init" depends="init.product" description="caller must define jdk.tools.jar and product.dir or run from product.dir"> - <echo message="init ant-examples.xml"/> + <echo message="init ant-examples.xml"/> <!-- directory produced during test install --> <property name="ajx.base.dir" location="${productTest.output.dir}/ajx-output"/> @@ -90,14 +90,14 @@ <mkdir dir="${noclass.dir}"/> <delete dir="${noclass.dir}"/> <mkdir dir="${noclass.dir}"/> - <javac srcdir="." - includes="${noclass}.java" + <javac srcdir="." + includes="${noclass}.java" destdir="${noclass.dir}" failonerror="true"/> <delete file="${noclass}.java"/> <echo message=" todo check file: ${noclass}.java"/> <java classname="${noclass}" - failonerror="true" + failonerror="true" classpath="${noclass.dir}"/> </target> @@ -107,7 +107,7 @@ <target name="Ajx" depends="init.taskdefs" description="for {example}, compile {list}, doc {list}, and run {class}"> <echo message="##### START Ajx example=${example} list=${list} class=${class}" /> - <property name="exdir" + <property name="exdir" value="${ajx.base.dir}/${example}"/> <property name="expect.exdir" value="${ajx.expect.dir}/${example}"/> <mkdir dir="${exdir}/classes"/> @@ -121,9 +121,9 @@ <mkdir dir="${exdir}/docs"/> <echo message="##################### Ajx ajc ${list}"/> - <ajc + <ajc destdir="${exdir}/classes" - argfile="${list}" + argfile="${list}" failonerror="false" > <classpath> <pathelement location="${product.rt.jar}" /> @@ -132,7 +132,7 @@ </ajc> <!-- copying resources, etc. as javac does todo weak --> <copy todir="${exdir}/classes"> - <fileset dir="${srcDir}" + <fileset dir="${srcDir}" includes="**/*.properties,**/*.gif,**/*.jpg,**/*.props" /> </copy> @@ -142,11 +142,11 @@ verbose="yes" sourcepath="${product.examples.dir}" destdir="${exdir}/docs" - argfile="${list}" + argfile="${list}" classpath="${product.rt.jar}${PS}${jdk.tools.jar}" failonerror="false" > - <!-- internalclasspath - internalclasspath="${taskdef.classpath}" + <!-- internalclasspath + internalclasspath="${taskdef.classpath}" is required now - but still not producing docs <classpath> <pathelement location="${product.rt.jar}" /> @@ -157,7 +157,7 @@ <echo message="##################### Ajx run ${class} START - output in ${exdir}/output/out.txt"/> <java classname="${class}" output="${exdir}/output/out.txt" - fork="yes" + fork="yes" failonerror="false" > <!-- fork because ajc does a System.exit --> <classpath> @@ -201,12 +201,6 @@ <param name="srcDir" value="${tools.src.dir}"/> </antcall> <antcall target="Ajx"> - <param name="list" value="${tools.src.dir}/ajbrowser.lst"/> - <param name="example" value="source-tools-ajbrowser"/> - <param name="class" value="${noclass}"/> - <param name="srcDir" value="${tools.src.dir}"/> - </antcall> - <antcall target="Ajx"> <param name="list" value="${tools.src.dir}/ajdoc.lst"/> <param name="example" value="source-tools-ajdoc"/> <param name="class" value="org.aspectj.tools.ajdoc.Main"/> @@ -289,7 +283,7 @@ <param name="class" value="telecom.TimingSimulation"/> <param name="srcDir" value="."/> </antcall> - <!-- timeserver not in product - todo check + <!-- timeserver not in product - todo check <antcall target="Ajx"> <param name="list" value="timeserver/abort.lst"/> <param name="example" value="timeserver-abort"/> diff --git a/tests/product/build-aspectj/build.xml b/tests/product/build-aspectj/build.xml index 85b0670a6..d810aabc6 100644 --- a/tests/product/build-aspectj/build.xml +++ b/tests/product/build-aspectj/build.xml @@ -112,7 +112,6 @@ </path> <path id="tools.roots"> - <pathelement path="${aspectj.src}/ajbrowser/src"/> <pathelement path="${aspectj.src}/ajde/src"/> <pathelement path="${aspectj.src}/asm/src"/> <pathelement path="${aspectj.src}/bridge/src"/> diff --git a/tests/product/product-test.xml b/tests/product/product-test.xml index c5f1146d3..776e9d7d3 100644 --- a/tests/product/product-test.xml +++ b/tests/product/product-test.xml @@ -31,14 +31,14 @@ <!-- This only runs from ../../test-product.xml b/c it uses comparefiles w/o defining it --> <project name="product-test" default="test" basedir="."> - &aspectj_initProduct; + &aspectj_initProduct; <!-- ========================================================================== --> <!-- Init --> <!-- ========================================================================== --> <target name="init" depends="init.product,productTest.expect.dir" description="init values - launch from install dir or set product.dir variable"> - <echo message="init product-test.xml"/> + <echo message="init product-test.xml"/> <property name="productTest.classes.dir" location="${productTest.output.dir}/classes"/> <property name="script.expect.dir" @@ -64,11 +64,11 @@ <!-- ========================================================================== --> <!-- Run product tests --> <!-- ========================================================================== --> - <target name="test" + <target name="test" depends="test.examples.buildscript,test.script.telecom,test.tools.sources" description="run available tests"/> - <target name="test.script.telecom" + <target name="test.script.telecom" depends="init,productTest.dir,product.dir, productTest.expect.bat.dir,productTest.output.dir" description="ajc/ajdoc/java/ajdb telecom example using bat scripts"> @@ -138,11 +138,11 @@ </exec> <comparefiles lhsFile="${ajdb.out}" rhsFile="${expect.ajdb.out}"/> - </target> + </target> <!-- todo: also depends on jdk.tools.jar --> <!-- todo: ignore as duplicating examples/build.xml --> - <target name="test.examples.antscript" + <target name="test.examples.antscript" depends="init,productTest.dir,product.dir, product.taskdefs.jar,product.rt.jar, product.tools.jar" @@ -151,18 +151,18 @@ <ant antfile="${productTest.dir}/ant-example.xml" dir="${product.examples.dir}" output="${productTest.output.dir}/ant-example.ant.txt"> - <property name="PS" + <property name="PS" value="${path.separator}"/> - <property name="product.dir" + <property name="product.dir" value="${product.dir}"/> - <property name="jdk.tools.jar" + <property name="jdk.tools.jar" location="${jdk.tools.jar}"/> - <property name="jdk.dir" + <property name="jdk.dir" location="${jdk.dir}"/> </ant> </target> - <target name="test.examples.buildscript" + <target name="test.examples.buildscript" depends="init,product.dir, product.taskdefs.jar,product.rt.jar, product.tools.jar" @@ -184,14 +184,14 @@ <param name="example.target" value="nonGui" /> </antcall> - <!-- OutOfMemory if including all + <!-- OutOfMemory if including all <antcall target="antcall.test.examples.buildscript.norun"> <param name="example.target" value="all" /> </antcall> --> </target> - <target name="antcall.test.examples.buildscript.norun" + <target name="antcall.test.examples.buildscript.norun" depends="init,product.dir, product.taskdefs.jar,product.rt.jar, product.tools.jar" @@ -202,14 +202,14 @@ target="${example.target}" dir="${product.examples.dir}" output="${productTest.output.dir}/example-build.${example.target}.txt" > - <property name="JAVA_HOME" - location="${jdk.dir}"/> - <property name="norun" - location="skipRunning"/> + <property name="JAVA_HOME" + location="${jdk.dir}"/> + <property name="norun" + location="skipRunning"/> </ant> </target> - <target name="antcall.test.examples.buildscript" + <target name="antcall.test.examples.buildscript" depends="init,product.dir, product.taskdefs.jar,product.rt.jar, product.tools.jar" @@ -220,18 +220,18 @@ target="${example.target}" dir="${product.examples.dir}" output="${productTest.output.dir}/example-build.${example.target}.txt" > - <property name="JAVA_HOME" - location="${jdk.dir}"/> + <property name="JAVA_HOME" + location="${jdk.dir}"/> </ant> </target> <!-- see also more recent devenv/dev/bin/aj/testToolsSrc.sh --> - <target name="test.tools.sources" + <target name="test.tools.sources" depends="init,product.tools.jar,product.src.dir" description="test source dist using ajc, ajdoc (todo remove - see ant-example)"> - <property name="tools.source.out" + <property name="tools.source.out" location="${productTest.output.dir}/source-tools"/> <property name="test.source.classes.dir" location="${productTest.output.dir}/source-tools"/> @@ -253,9 +253,6 @@ <param name="target.name" value="ajde" /> </antcall> <antcall target="build.source.call"> - <param name="target.name" value="ajbrowser" /> - </antcall> - <antcall target="build.source.call"> <param name="target.name" value="ajdoc" /> </antcall> @@ -290,4 +287,3 @@ </target> </project> - |