rm and build

It was obsolete, and possibly defunt. It confused and annoyed users.
This commit is contained in:
Samuel Carlsson 2018-09-17 19:20:14 +02:00
parent 98b5258ea1
commit 9fe4111495
5 changed files with 2 additions and 257 deletions

View File

@ -14,7 +14,7 @@ overall clean code.
Before submitting a pull request, please go through the below checklist to verify
your proposed change meets, or exceeds, the quality of the jadb source code.
* Builds - Make sure the code builds by issuing `ant build`.
* Builds - Make sure the code builds by issuing `mvn clean install test`.
* Works - Make sure all the test runs and passes.
* Works - Double check any features you might have changed, and of course any _new_ code
by testing manually.
@ -25,4 +25,4 @@ your proposed change meets, or exceeds, the quality of the jadb source code.
full terse.
* Newline at end of file - This makes `cat`-ing files, etc easier.
Happy coding! I, the original author, and all users are grateful for your contribution. :-)
Happy coding! I, the original author, and all users are grateful for your contribution. :-)

View File

@ -1,2 +0,0 @@
path.variable.kotlin_bundled=/Applications/IntelliJ IDEA 15 CE.app/Contents/plugins/Kotlin/kotlinc
path.variable.maven_repository=/Users/vidstige/.m2/repository

147
build.xml
View File

@ -1,147 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="jadb" default="all">
<property file="build.properties"/>
<property environment="env"/>
<property name="jdk.home.1.6" value="${env.JAVA_HOME}"/>
<!-- Compiler options -->
<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="700m"/>
<patternset id="ignored.files">
<exclude name="**/*.hprof/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/*.rbc/**"/>
<exclude name="**/*~/**"/>
<exclude name="**/.DS_Store/**"/>
<exclude name="**/.git/**"/>
<exclude name="**/.hg/**"/>
<exclude name="**/.svn/**"/>
<exclude name="**/CVS/**"/>
<exclude name="**/RCS/**"/>
<exclude name="**/SCCS/**"/>
<exclude name="**/__pycache__/**"/>
<exclude name="**/_svn/**"/>
<exclude name="**/rcs/**"/>
<exclude name="**/vssver.scc/**"/>
<exclude name="**/vssver2.scc/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.war"/>
<include name="*.swc"/>
<include name="*.apk"/>
<include name="*.zip"/>
<include name="*.ear"/>
<include name="*.egg"/>
<include name="*.ane"/>
<include name="*.jar"/>
</patternset>
<patternset id="compiler.resources">
<exclude name="**/?*.java"/>
<exclude name="**/?*.form"/>
<exclude name="**/?*.class"/>
<exclude name="**/?*.groovy"/>
<exclude name="**/?*.scala"/>
<exclude name="**/?*.flex"/>
<exclude name="**/?*.kt"/>
<exclude name="**/?*.clj"/>
</patternset>
<!-- JDK definitions -->
<property name="jdk.bin.1.6" value="${jdk.home.1.6}/bin"/>
<path id="jdk.classpath.1.6">
<fileset dir="${jdk.home.1.6}">
<include name="lib/deploy.jar"/>
<include name="lib/dt.jar"/>
<include name="lib/javaws.jar"/>
<include name="lib/jce.jar"/>
<include name="lib/jconsole.jar"/>
<include name="lib/management-agent.jar"/>
<include name="lib/plugin.jar"/>
<include name="lib/sa-jdi.jar"/>
<include name="../Classes/charsets.jar"/>
<include name="../Classes/classes.jar"/>
<include name="../Classes/jsse.jar"/>
<include name="../Classes/ui.jar"/>
<include name="lib/ext/apple_provider.jar"/>
<include name="lib/ext/dnsns.jar"/>
<include name="lib/ext/localedata.jar"/>
<include name="lib/ext/sunjce_provider.jar"/>
<include name="lib/ext/sunpkcs11.jar"/>
</fileset>
</path>
<property name="project.jdk.home" value="${jdk.home.1.6}"/>
<property name="project.jdk.bin" value="${jdk.bin.1.6}"/>
<property name="project.jdk.classpath" value="jdk.classpath.1.6"/>
<!-- Project Libraries -->
<path id="library.junit-4.10.classpath">
<pathelement location="${basedir}/lib/junit-4.10.jar"/>
</path>
<!-- Modules -->
<import file="${basedir}/module_jadb.xml"/>
<target name="init" description="Build initialization">
<!-- Perform any build initialization in this target -->
</target>
<target name="clean" depends="clean.module.jadb" description="cleanup all"/>
<target name="build.modules" depends="init, clean, compile.module.jadb" description="build all modules"/>
<target name="init.artifacts">
<property name="artifacts.temp.dir" value="${basedir}/__artifacts_temp"/>
<property name="artifact.output.jadb:jar" value="${basedir}/out/artifacts/jadb_jar"/>
<mkdir dir="${artifacts.temp.dir}"/>
<property name="temp.jar.path.jadb.jar" value="${artifacts.temp.dir}/jadb.jar"/>
</target>
<target name="artifact.jadb:jar" depends="init.artifacts, compile.module.jadb" description="Build &#39;jadb:jar&#39; artifact">
<property name="artifact.temp.output.jadb:jar" value="${artifacts.temp.dir}/jadb_jar"/>
<mkdir dir="${artifact.temp.output.jadb:jar}"/>
<jar destfile="${temp.jar.path.jadb.jar}" duplicate="preserve" filesetmanifest="mergewithoutmain">
<zipfileset dir="${jadb.output.dir}"/>
<zipfileset file="${basedir}/META-INF/MANIFEST.MF" prefix="META-INF"/>
</jar>
<copy file="${temp.jar.path.jadb.jar}" tofile="${artifact.temp.output.jadb:jar}/jadb.jar"/>
</target>
<target name="build.all.artifacts" depends="artifact.jadb:jar" description="Build all artifacts">
<mkdir dir="${artifact.output.jadb:jar}"/>
<copy todir="${artifact.output.jadb:jar}">
<fileset dir="${artifact.temp.output.jadb:jar}"/>
</copy>
<!-- Delete temporary files -->
<delete dir="${artifacts.temp.dir}"/>
</target>
<target name="all" depends="build.modules, build.all.artifacts" description="build all"/>
<target name="test" depends="build.modules">
<junit haltonfailure="yes">
<classpath>
<pathelement path="bin/"/>
<pathelement location="lib/junit-4.10.jar"/>
</classpath>
<formatter type="plain" usefile="false" />
<batchtest>
<fileset dir="test/">
<include name="**/*TestCases.java" />
<include name="**/*Fixture.java" />
</fileset>
</batchtest>
</junit>
</target>
</project>

View File

@ -1,3 +0,0 @@
path.variable.kotlin_bundled=/Applications/IntelliJ IDEA 15 CE.app/Contents/plugins/Kotlin/kotlinc
path.variable.maven_repository=/Users/vidstige/.m2/repository
jdk.home.1.6=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home

View File

@ -1,103 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="module_jadb" default="compile.module.jadb">
<dirname property="module.jadb.basedir" file="${ant.file.module_jadb}"/>
<property name="module.jdk.home.jadb" value="${project.jdk.home}"/>
<property name="module.jdk.bin.jadb" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.jadb" value="${project.jdk.classpath}"/>
<property name="compiler.args.jadb" value="-encoding UTF-8 -source 1.6 -target 1.6 ${compiler.args}"/>
<property name="jadb.output.dir" value="${module.jadb.basedir}/bin"/>
<property name="jadb.testoutput.dir" value="${module.jadb.basedir}/bin"/>
<path id="jadb.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="jadb.module.production.classpath">
<path refid="${module.jdk.classpath.jadb}"/>
<path refid="library.junit-4.10.classpath"/>
</path>
<path id="jadb.runtime.production.module.classpath">
<pathelement location="${jadb.output.dir}"/>
<path refid="library.junit-4.10.classpath"/>
</path>
<path id="jadb.module.classpath">
<pathelement location="${jadb.output.dir}"/>
<path refid="${module.jdk.classpath.jadb}"/>
<path refid="library.junit-4.10.classpath"/>
</path>
<path id="jadb.runtime.module.classpath">
<pathelement location="${jadb.output.dir}"/>
<path refid="library.junit-4.10.classpath"/>
</path>
<patternset id="excluded.from.module.jadb">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.compilation.jadb">
<patternset refid="excluded.from.module.jadb"/>
</patternset>
<path id="jadb.module.sourcepath">
<dirset dir="${module.jadb.basedir}">
<include name="src"/>
</dirset>
</path>
<path id="jadb.module.test.sourcepath">
<dirset dir="${module.jadb.basedir}">
<include name="test"/>
</dirset>
</path>
<target name="compile.module.jadb" depends="compile.module.jadb.production,compile.module.jadb.tests" description="Compile module jadb"/>
<target name="compile.module.jadb.production" description="Compile module jadb; production classes">
<mkdir dir="${jadb.output.dir}"/>
<javac destdir="${jadb.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.jadb}/javac">
<compilerarg line="${compiler.args.jadb}"/>
<bootclasspath refid="jadb.module.bootclasspath"/>
<classpath refid="jadb.module.production.classpath"/>
<src refid="jadb.module.sourcepath"/>
<patternset refid="excluded.from.compilation.jadb"/>
</javac>
<copy todir="${jadb.output.dir}">
<fileset dir="${module.jadb.basedir}/src">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile.module.jadb.tests" depends="compile.module.jadb.production" description="compile module jadb; test classes" unless="skip.tests">
<mkdir dir="${jadb.testoutput.dir}"/>
<javac destdir="${jadb.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.jadb}/javac">
<compilerarg line="${compiler.args.jadb}"/>
<bootclasspath refid="jadb.module.bootclasspath"/>
<classpath refid="jadb.module.classpath"/>
<src refid="jadb.module.test.sourcepath"/>
<patternset refid="excluded.from.compilation.jadb"/>
</javac>
<copy todir="${jadb.testoutput.dir}">
<fileset dir="${module.jadb.basedir}/test">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="clean.module.jadb" description="cleanup module">
<delete dir="${jadb.output.dir}"/>
<delete dir="${jadb.testoutput.dir}"/>
</target>
</project>