Skip to content

Commit 23f5cde

Browse files
committed
Change 'build.modules' task to just 'build'
1 parent 40e03ce commit 23f5cde

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

javacs-lab00/build.xml

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project name="cs-hello-world-lab" default="all">
3-
4-
3+
4+
55
<property file="build.properties"/>
66
<!-- Uncomment the following property if no tests compilation is needed -->
77
<!--
88
<property name="skip.tests" value="true"/>
99
-->
1010

1111
<!-- Compiler options -->
12-
12+
1313
<property name="compiler.debug" value="on"/>
1414
<property name="compiler.generate.no.warnings" value="off"/>
1515
<property name="compiler.args" value=""/>
@@ -54,9 +54,9 @@
5454
<exclude name="**/?*.clj"/>
5555
<exclude name="**/?*.aj"/>
5656
</patternset>
57-
57+
5858
<!-- JDK definitions -->
59-
59+
6060
<property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
6161
<path id="jdk.classpath.1.8">
6262
<fileset dir="${jdk.home.1.8}">
@@ -90,44 +90,44 @@
9090
<include name="lib/tools.jar"/>
9191
</fileset>
9292
</path>
93-
93+
9494
<property name="project.jdk.home" value="${jdk.home.1.8}"/>
9595
<property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
9696
<property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
97-
97+
9898
<!-- Modules -->
99-
100-
99+
100+
101101
<!-- Module cs-hello-world-lab -->
102-
102+
103103
<dirname property="module.cs-hello-world-lab.basedir" file="${ant.file}"/>
104-
105-
104+
105+
106106
<property name="module.jdk.home.cs-hello-world-lab" value="${project.jdk.home}"/>
107107
<property name="module.jdk.bin.cs-hello-world-lab" value="${project.jdk.bin}"/>
108108
<property name="module.jdk.classpath.cs-hello-world-lab" value="${project.jdk.classpath}"/>
109-
109+
110110
<property name="compiler.args.cs-hello-world-lab" value="-encoding UTF-8 -source 8 -target 8 ${compiler.args}"/>
111-
111+
112112
<property name="cs-hello-world-lab.output.dir" value="${module.cs-hello-world-lab.basedir}/out/production/cs-hello-world-lab"/>
113113
<property name="cs-hello-world-lab.testoutput.dir" value="${module.cs-hello-world-lab.basedir}/out/test/cs-hello-world-lab"/>
114-
114+
115115
<path id="cs-hello-world-lab.module.bootclasspath">
116116
<!-- Paths to be included in compilation bootclasspath -->
117117
</path>
118-
118+
119119
<path id="cs-hello-world-lab.module.production.classpath">
120120
<path refid="${module.jdk.classpath.cs-hello-world-lab}"/>
121121
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
122122
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
123123
</path>
124-
124+
125125
<path id="cs-hello-world-lab.runtime.production.module.classpath">
126126
<pathelement location="${cs-hello-world-lab.output.dir}"/>
127127
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
128128
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
129129
</path>
130-
130+
131131
<path id="cs-hello-world-lab.module.classpath">
132132
<path refid="${module.jdk.classpath.cs-hello-world-lab}"/>
133133
<pathelement location="${cs-hello-world-lab.output.dir}"/>
@@ -136,7 +136,7 @@
136136
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
137137
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
138138
</path>
139-
139+
140140
<path id="cs-hello-world-lab.runtime.module.classpath">
141141
<pathelement location="${cs-hello-world-lab.testoutput.dir}"/>
142142
<pathelement location="${cs-hello-world-lab.output.dir}"/>
@@ -145,25 +145,25 @@
145145
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/>
146146
<pathelement location="${idea.home}/lib/junit-4.12.jar"/>
147147
</path>
148-
149-
148+
149+
150150
<patternset id="excluded.from.module.cs-hello-world-lab">
151151
<patternset refid="ignored.files"/>
152152
</patternset>
153-
153+
154154
<patternset id="excluded.from.compilation.cs-hello-world-lab">
155155
<patternset refid="excluded.from.module.cs-hello-world-lab"/>
156156
</patternset>
157-
157+
158158
<path id="cs-hello-world-lab.module.sourcepath">
159159
<dirset dir="${module.cs-hello-world-lab.basedir}">
160160
<include name="src"/>
161161
</dirset>
162162
</path>
163-
164-
163+
164+
165165
<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-
166+
167167
<target name="compile.module.cs-hello-world-lab.production" description="Compile module cs-hello-world-lab; production classes">
168168
<mkdir dir="${cs-hello-world-lab.output.dir}"/>
169169
<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">
@@ -173,17 +173,17 @@
173173
<src refid="cs-hello-world-lab.module.sourcepath"/>
174174
<patternset refid="excluded.from.compilation.cs-hello-world-lab"/>
175175
</javac>
176-
176+
177177
<copy todir="${cs-hello-world-lab.output.dir}">
178178
<fileset dir="${module.cs-hello-world-lab.basedir}/src">
179179
<patternset refid="compiler.resources"/>
180180
<type type="file"/>
181181
</fileset>
182182
</copy>
183183
</target>
184-
184+
185185
<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-
186+
187187
<target name="clean.module.cs-hello-world-lab" description="cleanup module">
188188
<delete dir="${cs-hello-world-lab.output.dir}"/>
189189
<delete dir="${cs-hello-world-lab.testoutput.dir}"/>
@@ -204,10 +204,10 @@
204204
<test name="com.flatironschool.javacs.MainTest" todir="./src"/>
205205
</junit>
206206
</target>
207-
207+
208208
<target name="clean" depends="clean.module.cs-hello-world-lab" description="cleanup all"/>
209-
210-
<target name="build.modules" depends="clean, compile.module.cs-hello-world-lab, test" description="build all modules"/>
211-
212-
<target name="all" depends="build.modules" description="build all"/>
213-
</project>
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"/>
213+
</project>

0 commit comments

Comments
 (0)