Skip to content

Commit 39b439f

Browse files
pletcherpletcher
committed
Fix build.xml issues so that this lab plays nicely with Learn
1 parent 23f5cde commit 39b439f

File tree

3 files changed

+90
-212
lines changed

3 files changed

+90
-212
lines changed

Diff for: ‎javacs-lab00/build.xml

+90-212
Original file line numberDiff line numberDiff line change
@@ -1,213 +1,91 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="cs-hello-world-lab" default="all">
3-
4-
5-
<property file="build.properties"/>
6-
<!-- Uncomment the following property if no tests compilation is needed -->
7-
<!--
8-
<property name="skip.tests" value="true"/>
9-
-->
10-
11-
<!-- Compiler options -->
12-
13-
<property name="compiler.debug" value="on"/>
14-
<property name="compiler.generate.no.warnings" value="off"/>
15-
<property name="compiler.args" value=""/>
16-
<property name="compiler.max.memory" value="700m"/>
17-
<patternset id="ignored.files">
18-
<exclude name="**/*.hprof/**"/>
19-
<exclude name="**/*.pyc/**"/>
20-
<exclude name="**/*.pyo/**"/>
21-
<exclude name="**/*.rbc/**"/>
22-
<exclude name="**/*~/**"/>
23-
<exclude name="**/.DS_Store/**"/>
24-
<exclude name="**/.git/**"/>
25-
<exclude name="**/.hg/**"/>
26-
<exclude name="**/.svn/**"/>
27-
<exclude name="**/CVS/**"/>
28-
<exclude name="**/RCS/**"/>
29-
<exclude name="**/SCCS/**"/>
30-
<exclude name="**/__pycache__/**"/>
31-
<exclude name="**/_svn/**"/>
32-
<exclude name="**/rcs/**"/>
33-
<exclude name="**/vssver.scc/**"/>
34-
<exclude name="**/vssver2.scc/**"/>
35-
</patternset>
36-
<patternset id="library.patterns">
37-
<include name="*.war"/>
38-
<include name="*.swc"/>
39-
<include name="*.apk"/>
40-
<include name="*.zip"/>
41-
<include name="*.ear"/>
42-
<include name="*.egg"/>
43-
<include name="*.ane"/>
44-
<include name="*.jar"/>
45-
</patternset>
46-
<patternset id="compiler.resources">
47-
<exclude name="**/?*.java"/>
48-
<exclude name="**/?*.form"/>
49-
<exclude name="**/?*.class"/>
50-
<exclude name="**/?*.groovy"/>
51-
<exclude name="**/?*.scala"/>
52-
<exclude name="**/?*.flex"/>
53-
<exclude name="**/?*.kt"/>
54-
<exclude name="**/?*.clj"/>
55-
<exclude name="**/?*.aj"/>
56-
</patternset>
57-
58-
<!-- JDK definitions -->
59-
60-
<property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
61-
<path id="jdk.classpath.1.8">
62-
<fileset dir="${jdk.home.1.8}">
63-
<include name="jre/lib/charsets.jar"/>
64-
<include name="jre/lib/deploy.jar"/>
65-
<include name="jre/lib/ext/cldrdata.jar"/>
66-
<include name="jre/lib/ext/dnsns.jar"/>
67-
<include name="jre/lib/ext/jaccess.jar"/>
68-
<include name="jre/lib/ext/jfxrt.jar"/>
69-
<include name="jre/lib/ext/localedata.jar"/>
70-
<include name="jre/lib/ext/nashorn.jar"/>
71-
<include name="jre/lib/ext/sunec.jar"/>
72-
<include name="jre/lib/ext/sunjce_provider.jar"/>
73-
<include name="jre/lib/ext/sunpkcs11.jar"/>
74-
<include name="jre/lib/ext/zipfs.jar"/>
75-
<include name="jre/lib/javaws.jar"/>
76-
<include name="jre/lib/jce.jar"/>
77-
<include name="jre/lib/jfr.jar"/>
78-
<include name="jre/lib/jfxswt.jar"/>
79-
<include name="jre/lib/jsse.jar"/>
80-
<include name="jre/lib/management-agent.jar"/>
81-
<include name="jre/lib/plugin.jar"/>
82-
<include name="jre/lib/resources.jar"/>
83-
<include name="jre/lib/rt.jar"/>
84-
<include name="lib/ant-javafx.jar"/>
85-
<include name="lib/dt.jar"/>
86-
<include name="lib/javafx-mx.jar"/>
87-
<include name="lib/jconsole.jar"/>
88-
<include name="lib/packager.jar"/>
89-
<include name="lib/sa-jdi.jar"/>
90-
<include name="lib/tools.jar"/>
91-
</fileset>
92-
</path>
93-
94-
<property name="project.jdk.home" value="${jdk.home.1.8}"/>
95-
<property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
96-
<property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
97-
98-
<!-- Modules -->
99-
100-
101-
<!-- Module cs-hello-world-lab -->
102-
103-
<dirname property="module.cs-hello-world-lab.basedir" file="${ant.file}"/>
104-
105-
106-
<property name="module.jdk.home.cs-hello-world-lab" value="${project.jdk.home}"/>
107-
<property name="module.jdk.bin.cs-hello-world-lab" value="${project.jdk.bin}"/>
108-
<property name="module.jdk.classpath.cs-hello-world-lab" value="${project.jdk.classpath}"/>
109-
110-
<property name="compiler.args.cs-hello-world-lab" value="-encoding UTF-8 -source 8 -target 8 ${compiler.args}"/>
111-
112-
<property name="cs-hello-world-lab.output.dir" value="${module.cs-hello-world-lab.basedir}/out/production/cs-hello-world-lab"/>
113-
<property name="cs-hello-world-lab.testoutput.dir" value="${module.cs-hello-world-lab.basedir}/out/test/cs-hello-world-lab"/>
114-
115-
<path id="cs-hello-world-lab.module.bootclasspath">
116-
<!-- Paths to be included in compilation bootclasspath -->
117-
</path>
118-
119-
<path id="cs-hello-world-lab.module.production.classpath">
120-
<path refid="${module.jdk.classpath.cs-hello-world-lab}"/>
121-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
122-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
123-
</path>
124-
125-
<path id="cs-hello-world-lab.runtime.production.module.classpath">
126-
<pathelement location="${cs-hello-world-lab.output.dir}"/>
127-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
128-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
129-
</path>
130-
131-
<path id="cs-hello-world-lab.module.classpath">
132-
<path refid="${module.jdk.classpath.cs-hello-world-lab}"/>
133-
<pathelement location="${cs-hello-world-lab.output.dir}"/>
134-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
135-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
136-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
137-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
138-
</path>
139-
140-
<path id="cs-hello-world-lab.runtime.module.classpath">
141-
<pathelement location="${cs-hello-world-lab.testoutput.dir}"/>
142-
<pathelement location="${cs-hello-world-lab.output.dir}"/>
143-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
144-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
145-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
146-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
147-
</path>
148-
149-
150-
<patternset id="excluded.from.module.cs-hello-world-lab">
151-
<patternset refid="ignored.files"/>
152-
</patternset>
153-
154-
<patternset id="excluded.from.compilation.cs-hello-world-lab">
155-
<patternset refid="excluded.from.module.cs-hello-world-lab"/>
156-
</patternset>
157-
158-
<path id="cs-hello-world-lab.module.sourcepath">
159-
<dirset dir="${module.cs-hello-world-lab.basedir}">
160-
<include name="src"/>
161-
</dirset>
162-
</path>
163-
164-
165-
<target name="compile.module.cs-hello-world-lab" depends="compile.module.cs-hello-world-lab.production,compile.module.cs-hello-world-lab.tests" description="Compile module cs-hello-world-lab"/>
166-
167-
<target name="compile.module.cs-hello-world-lab.production" description="Compile module cs-hello-world-lab; production classes">
168-
<mkdir dir="${cs-hello-world-lab.output.dir}"/>
169-
<javac destdir="${cs-hello-world-lab.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.cs-hello-world-lab}/javac" includeantruntime="true">
170-
<compilerarg line="${compiler.args.cs-hello-world-lab}"/>
171-
<bootclasspath refid="cs-hello-world-lab.module.bootclasspath"/>
172-
<classpath refid="cs-hello-world-lab.module.production.classpath"/>
173-
<src refid="cs-hello-world-lab.module.sourcepath"/>
174-
<patternset refid="excluded.from.compilation.cs-hello-world-lab"/>
175-
</javac>
176-
177-
<copy todir="${cs-hello-world-lab.output.dir}">
178-
<fileset dir="${module.cs-hello-world-lab.basedir}/src">
179-
<patternset refid="compiler.resources"/>
180-
<type type="file"/>
181-
</fileset>
182-
</copy>
183-
</target>
184-
185-
<target name="compile.module.cs-hello-world-lab.tests" depends="compile.module.cs-hello-world-lab.production" description="compile module cs-hello-world-lab; test classes" unless="skip.tests"/>
186-
187-
<target name="clean.module.cs-hello-world-lab" description="cleanup module">
188-
<delete dir="${cs-hello-world-lab.output.dir}"/>
189-
<delete dir="${cs-hello-world-lab.testoutput.dir}"/>
190-
</target>
191-
192-
<target name="init" description="Build initialization">
193-
<!-- Perform any build initialization in this target -->
194-
</target>
195-
196-
<target name="test">
197-
<junit>
198-
<classpath>
199-
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
200-
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
201-
<pathelement location="${cs-hello-world-lab.output.dir}"/>
202-
</classpath>
203-
<formatter type="plain" usefile="false"/>
204-
<test name="com.flatironschool.javacs.MainTest" todir="./src"/>
205-
</junit>
206-
</target>
207-
208-
<target name="clean" depends="clean.module.cs-hello-world-lab" description="cleanup all"/>
209-
210-
<target name="build" depends="clean, compile.module.cs-hello-world-lab, test" description="build all modules"/>
211-
212-
<target name="all" depends="build" description="build all"/>
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<!-- WARNING: Eclipse auto-generated file.
3+
Any modifications will be overwritten.
4+
To include a user specific buildfile here, simply create one in the same
5+
directory with the processing instruction <?eclipse.ant.import?>
6+
as the first entry and export the buildfile again. --><project basedir="." default="build" name="JavaCS">
7+
<property environment="env"/>
8+
<property name="junit.output.dir" value="junit"/>
9+
<property name="debuglevel" value="source,lines,vars"/>
10+
<property name="target" value="1.6"/>
11+
<property name="source" value="1.6"/>
12+
<path id="JavaCS.classpath">
13+
<pathelement location="bin"/>
14+
<pathelement location="lib/jedis-2.8.0.jar"/>
15+
<pathelement location="lib/jsoup-1.8.3.jar"/>
16+
<pathelement location="lib/junit-4.12.jar"/>
17+
<pathelement location="lib/hamcrest-core-1.3.jar"/>
18+
<pathelement location="lib/jcommon-1.0.23.jar"/>
19+
<pathelement location="lib/jfreechart-1.0.19.jar"/>
20+
<pathelement location="lib/servlet.jar"/>
21+
<pathelement location="lib/ant-junit.jar"/>
22+
<pathelement location="lib/commons-math3-3.6.jar"/>
23+
</path>
24+
<target name="init">
25+
<mkdir dir="bin"/>
26+
<copy includeemptydirs="false" todir="bin">
27+
<fileset dir="src">
28+
<exclude name="**/*.launch"/>
29+
<exclude name="**/*.java"/>
30+
</fileset>
31+
</copy>
32+
</target>
33+
<target name="clean">
34+
<delete dir="bin"/>
35+
</target>
36+
<target depends="clean" name="cleanall"/>
37+
<target depends="build-subprojects,build-project" name="build"/>
38+
<target name="build-subprojects"/>
39+
<target depends="init" name="build-project">
40+
<echo message="${ant.project.name}: ${ant.file}"/>
41+
<javac debug="true" debuglevel="${debuglevel}" destdir="bin" includeantruntime="false" source="${source}" target="${target}">
42+
<src path="src"/>
43+
<classpath refid="JavaCS.classpath"/>
44+
</javac>
45+
</target>
46+
<target description="Build all projects which reference this project. Useful to propagate changes." name="build-refprojects"/>
47+
<target description="copy Eclipse compiler jars to ant lib directory" name="init-eclipse-compiler">
48+
<copy todir="${ant.library.dir}">
49+
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
50+
</copy>
51+
<unzip dest="${ant.library.dir}">
52+
<patternset includes="jdtCompilerAdapter.jar"/>
53+
<fileset dir="${ECLIPSE_HOME}/plugins" includes="org.eclipse.jdt.core_*.jar"/>
54+
</unzip>
55+
</target>
56+
<target description="compile project with Eclipse compiler" name="build-eclipse-compiler">
57+
<property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
58+
<antcall target="build"/>
59+
</target>
60+
<target depends="build,HelloWorldTest" name="test"/>
61+
<target name="HelloWorldTest">
62+
<mkdir dir="${junit.output.dir}"/>
63+
<junit fork="yes" printsummary="withOutAndErr">
64+
<formatter type="xml"/>
65+
<formatter type="plain" usefile="false"/>
66+
<test name="com.flatironschool.javacs.HelloWorldTest" todir="${junit.output.dir}"/>
67+
<classpath refid="JavaCS.classpath"/>
68+
</junit>
69+
</target>
70+
<target name="HelloWorld">
71+
<java classname="com.flatironschool.javacs.HelloWorld" failonerror="true" fork="yes">
72+
<classpath refid="JavaCS.classpath"/>
73+
</java>
74+
</target>
75+
<target name="HelloWorldTest.testGetVersion">
76+
<mkdir dir="${junit.output.dir}"/>
77+
<junit fork="yes" printsummary="withOutAndErr">
78+
<formatter type="xml"/>
79+
<test name="com.flatironschool.javacs.HelloWorldTest" todir="${junit.output.dir}"/>
80+
<classpath refid="JavaCS.classpath"/>
81+
</junit>
82+
</target>
83+
<target name="junitreport">
84+
<junitreport todir="${junit.output.dir}">
85+
<fileset dir="${junit.output.dir}">
86+
<include name="TEST-*.xml"/>
87+
</fileset>
88+
<report format="frames" todir="${junit.output.dir}"/>
89+
</junitreport>
90+
</target>
21391
</project>

Diff for: ‎javacs-lab00/lib/hamcrest-core-1.3.jar

44 KB
Binary file not shown.

Diff for: ‎javacs-lab00/lib/junit-4.12.jar

308 KB
Binary file not shown.

0 commit comments

Comments
 (0)