| OLD | NEW |
| 1 <project default="dist"> | 1 <project default="dist"> |
| 2 <import file="sources.xml"/> | 2 <import file="sources.xml"/> |
| 3 <import file="test_sources.xml"/> | 3 <import file="test_sources.xml"/> |
| 4 <import file="corelib_sources.xml"/> | 4 <import file="corelib_sources.xml"/> |
| 5 <import file="compiler_corelib_sources.xml"/> | 5 <import file="compiler_corelib_sources.xml"/> |
| 6 <import file="domlib_sources.xml"/> | 6 <import file="domlib_sources.xml"/> |
| 7 <import file="htmllib_sources.xml"/> | 7 <import file="htmllib_sources.xml"/> |
| 8 <import file="jsonlib_sources.xml"/> | 8 <import file="jsonlib_sources.xml"/> |
| 9 <import file="isolatelib_sources.xml"/> |
| 9 | 10 |
| 10 <!-- | 11 <!-- |
| 11 The file build.properties does not exist. If provided, properties can be cus
tomized. | 12 The file build.properties does not exist. If provided, properties can be cus
tomized. |
| 12 --> | 13 --> |
| 13 <property file="build.properties" /> | 14 <property file="build.properties" /> |
| 14 | 15 |
| 15 <!-- | 16 <!-- |
| 16 Configuration properties. | 17 Configuration properties. |
| 17 --> | 18 --> |
| 18 <property name="build.dir" value="out"/> | 19 <property name="build.dir" value="out"/> |
| 19 | 20 |
| 20 <property name="build.classes.dir" value="${build.dir}/classes"/> | 21 <property name="build.classes.dir" value="${build.dir}/classes"/> |
| 21 | 22 |
| 22 <property name="corelib.source.dir" value="${build.dir}/corelib"/> | 23 <property name="corelib.source.dir" value="${build.dir}/corelib"/> |
| 23 | 24 |
| 24 <property name="domlib.source.dir" value="${build.dir}/../client/dom/"/> | 25 <property name="domlib.source.dir" value="${build.dir}/../client/dom/"/> |
| 25 | 26 |
| 26 <property name="htmllib.source.dir" value="${build.dir}/../client/html/"/> | 27 <property name="htmllib.source.dir" value="${build.dir}/../client/html/"/> |
| 27 | 28 |
| 28 <property name="jsonlib.source.dir" value="${build.dir}/../lib/json/"/> | 29 <property name="jsonlib.source.dir" value="${build.dir}/../lib/json/"/> |
| 29 | 30 |
| 31 <property name="isolatelib.source.dir" value="${build.dir}/../lib/isolate/"/> |
| 32 |
| 30 <property name="build.test.classes.dir" value="${build.dir}/test/classes"/> | 33 <property name="build.test.classes.dir" value="${build.dir}/test/classes"/> |
| 31 | 34 |
| 32 <property name="dartc.jar" value="${build.dir}/dartc.jar"/> | 35 <property name="dartc.jar" value="${build.dir}/dartc.jar"/> |
| 33 | 36 |
| 34 <property name="corelib.jar" value="${build.dir}/corelib.jar"/> | 37 <property name="corelib.jar" value="${build.dir}/corelib.jar"/> |
| 35 | 38 |
| 36 <property name="domlib.jar" value="${build.dir}/domlib.jar"/> | 39 <property name="domlib.jar" value="${build.dir}/domlib.jar"/> |
| 37 | 40 |
| 38 <property name="htmllib.jar" value="${build.dir}/htmllib.jar"/> | 41 <property name="htmllib.jar" value="${build.dir}/htmllib.jar"/> |
| 39 | 42 |
| 40 <property name="jsonlib.jar" value="${build.dir}/jsonlib.jar"/> | 43 <property name="jsonlib.jar" value="${build.dir}/jsonlib.jar"/> |
| 41 | 44 |
| 45 <property name="isolatelib.jar" value="${build.dir}/isolatelib.jar"/> |
| 46 |
| 42 <property name="dist.dir" value="${build.dir}/dist"/> | 47 <property name="dist.dir" value="${build.dir}/dist"/> |
| 43 | 48 |
| 44 <property name="test.report.dir" value="${build.dir}/test"/> | 49 <property name="test.report.dir" value="${build.dir}/test"/> |
| 45 | 50 |
| 46 <property name="third_party.dir" value="../third_party"/> | 51 <property name="third_party.dir" value="../third_party"/> |
| 47 | 52 |
| 48 <property name="d8" value="$DARTC_HOME/bin/d8.$OS"/> | 53 <property name="d8" value="$DARTC_HOME/bin/d8.$OS"/> |
| 49 | 54 |
| 50 <property name="test_py" location="../tools/test.py"/> | 55 <property name="test_py" location="../tools/test.py"/> |
| 51 | 56 |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 143 <delete dir="${build.dir}/api/dart/json"/> | 148 <delete dir="${build.dir}/api/dart/json"/> |
| 144 <delete file="${jsonlib.jar}"/> | 149 <delete file="${jsonlib.jar}"/> |
| 145 <mkdir dir="${jsonlib.source.dir}"/> | 150 <mkdir dir="${jsonlib.source.dir}"/> |
| 146 <copy todir="${jsonlib.source.dir}/json"> | 151 <copy todir="${jsonlib.source.dir}/json"> |
| 147 <filelist refid="jsonlib_resources"/> | 152 <filelist refid="jsonlib_resources"/> |
| 148 </copy> | 153 </copy> |
| 149 <jar destfile="${jsonlib.jar}" basedir="${jsonlib.source.dir}"/> | 154 <jar destfile="${jsonlib.jar}" basedir="${jsonlib.source.dir}"/> |
| 150 <touch file="${build.dir}/jsonlib.jar.stamp"/> | 155 <touch file="${build.dir}/jsonlib.jar.stamp"/> |
| 151 </target> | 156 </target> |
| 152 | 157 |
| 158 <target name="isolatelib.jar" description="Packages the isolate library resour
ces into one jar file." > |
| 159 <delete dir="${build.dir}/api/dart/isolate"/> |
| 160 <delete file="${isolatelib.jar}"/> |
| 161 <mkdir dir="${isolatelib.source.dir}"/> |
| 162 <copy todir="${isolatelib.source.dir}/isolate"> |
| 163 <filelist refid="isolatelib_resources"/> |
| 164 </copy> |
| 165 <jar destfile="${isolatelib.jar}" basedir="${isolatelib.source.dir}"/> |
| 166 <touch file="${build.dir}/isolatelib.jar.stamp"/> |
| 167 </target> |
| 168 |
| 169 |
| 153 <target name="compile-tests" depends="compile" description="Compiles all of th
e java tests and copies the resources to the test classes directory." > | 170 <target name="compile-tests" depends="compile" description="Compiles all of th
e java tests and copies the resources to the test classes directory." > |
| 154 <mkdir dir="${build.test.classes.dir}"/> | 171 <mkdir dir="${build.test.classes.dir}"/> |
| 155 <javac destdir="${build.test.classes.dir}" | 172 <javac destdir="${build.test.classes.dir}" |
| 156 sourcepath="" | 173 sourcepath="" |
| 157 srcdir="javatests" | 174 srcdir="javatests" |
| 158 includes="${javatests_sources}" | 175 includes="${javatests_sources}" |
| 159 excludes="com/google/dart/compiler/vm/**" | 176 excludes="com/google/dart/compiler/vm/**" |
| 160 fork="true" | 177 fork="true" |
| 161 debug="true"> | 178 debug="true"> |
| 162 <classpath refid="classpath.compile.tests"/> | 179 <classpath refid="classpath.compile.tests"/> |
| 163 </javac> | 180 </javac> |
| 164 <!-- | 181 <!-- |
| 165 Copy the non-java resources. | 182 Copy the non-java resources. |
| 166 --> | 183 --> |
| 167 <copy todir="${build.test.classes.dir}"> | 184 <copy todir="${build.test.classes.dir}"> |
| 168 <filelist refid="javatests_resources"/> | 185 <filelist refid="javatests_resources"/> |
| 169 </copy> | 186 </copy> |
| 170 </target> | 187 </target> |
| 171 | 188 |
| 172 <target name="dartc.jar" depends="compile" description="Creates a jar for dart
c without bundling the dependencies."> | 189 <target name="dartc.jar" depends="compile" description="Creates a jar for dart
c without bundling the dependencies."> |
| 173 <jar destfile="${dartc.jar}" basedir="${build.classes.dir}" manifest="dartc.
mf"/> | 190 <jar destfile="${dartc.jar}" basedir="${build.classes.dir}" manifest="dartc.
mf"/> |
| 174 </target> | 191 </target> |
| 175 | 192 |
| 176 <target name="syslib" depends="corelib.jar,domlib.jar,htmllib.jar,jsonlib.jar"
description="Stub for system library task"> | 193 <target name="syslib" depends="corelib.jar,domlib.jar,htmllib.jar,jsonlib.jar,
isolatelib.jar" description="Stub for system library task"> |
| 177 <!-- | 194 <!-- |
| 178 Copy the system library jars to the lib folder. | 195 Copy the system library jars to the lib folder. |
| 179 --> | 196 --> |
| 180 <copy file="${corelib.jar}" todir="${dist.dir}/lib"/> | 197 <copy file="${corelib.jar}" todir="${dist.dir}/lib"/> |
| 181 <copy file="${domlib.jar}" todir="${dist.dir}/lib"/> | 198 <copy file="${domlib.jar}" todir="${dist.dir}/lib"/> |
| 182 <copy file="${htmllib.jar}" todir="${dist.dir}/lib"/> | 199 <copy file="${htmllib.jar}" todir="${dist.dir}/lib"/> |
| 183 <copy file="${jsonlib.jar}" todir="${dist.dir}/lib"/> | 200 <copy file="${jsonlib.jar}" todir="${dist.dir}/lib"/> |
| 201 <copy file="${isolatelib.jar}" todir="${dist.dir}/lib"/> |
| 184 | 202 |
| 185 <touch file="${build.dir}/syslib.stamp"/> | 203 <touch file="${build.dir}/syslib.stamp"/> |
| 186 </target> | 204 </target> |
| 187 | 205 |
| 188 <target name="syslib_clean" description="Clean out the system libraries"> | 206 <target name="syslib_clean" description="Clean out the system libraries"> |
| 189 <delete file="${build.dir}/syslib.stamp"/> | 207 <delete file="${build.dir}/syslib.stamp"/> |
| 190 </target> | 208 </target> |
| 191 | 209 |
| 192 <target name="dist" depends="dartc.jar" description="Creates a directory that
contains a standalone distribution for dartc."> | 210 <target name="dist" depends="dartc.jar" description="Creates a directory that
contains a standalone distribution for dartc."> |
| 193 <!-- | 211 <!-- |
| 194 Ensure the necessary subdirectories exist. | 212 Ensure the necessary subdirectories exist. |
| 195 --> | 213 --> |
| 196 <mkdir dir="${dist.dir}/bin"/> | 214 <mkdir dir="${dist.dir}/bin"/> |
| 197 <mkdir dir="${dist.dir}/lib"/> | 215 <mkdir dir="${dist.dir}/lib"/> |
| 198 | 216 |
| 199 <!-- | 217 <!-- |
| 200 Copy the dart jar to the lib folder. | 218 Copy the dart jar to the lib folder. |
| 201 --> | 219 --> |
| 202 <copy file="${dartc.jar}" todir="${dist.dir}/lib"/> | 220 <copy file="${dartc.jar}" todir="${dist.dir}/lib"/> |
| 203 | 221 |
| 204 <!-- | 222 <!-- |
| 205 Re-root the classpaths from third_party into the lib folder of the distro. | 223 Re-root the classpaths from third_party into the lib folder of the distro. |
| 206 --> | 224 --> |
| 207 <pathconvert property="dartc.classpath.runtime.unix" targetos="unix" refid="
classpath.runtime"> | 225 <pathconvert property="dartc.classpath.runtime.unix" targetos="unix" refid="
classpath.runtime"> |
| 208 <regexpmapper from="${third_party.dir}/(.*)" to="$DARTC_LIBS/\1"/> | 226 <regexpmapper from="${third_party.dir}/(.*)" to="$DARTC_LIBS/\1"/> |
| 209 </pathconvert> | 227 </pathconvert> |
| 210 | 228 |
| 211 <copy file="scripts/dartc.sh" tofile="${dist.dir}/bin/dartc"> | 229 <copy file="scripts/dartc.sh" tofile="${dist.dir}/bin/dartc"> |
| 212 <filterset> | 230 <filterset> |
| 213 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:${
dartc.classpath.runtime.unix}"/> | 231 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:$D
ARTC_LIBS/isolatelib.jar:${dartc.classpath.runtime.unix}"/> |
| 214 </filterset> | 232 </filterset> |
| 215 </copy> | 233 </copy> |
| 216 <chmod file="${dist.dir}/bin/dartc" perm="a+rx"/> | 234 <chmod file="${dist.dir}/bin/dartc" perm="a+rx"/> |
| 217 | 235 |
| 218 <copy file="scripts/dartc_test.sh" tofile="${dist.dir}/bin/dartc_test"> | 236 <copy file="scripts/dartc_test.sh" tofile="${dist.dir}/bin/dartc_test"> |
| 219 <filterset> | 237 <filterset> |
| 220 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:${
dartc.classpath.runtime.unix}"/> | 238 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:$D
ARTC_LIBS/isolatelib.jar:${dartc.classpath.runtime.unix}"/> |
| 221 <filter token="D8_EXEC" value="${d8}"/> | 239 <filter token="D8_EXEC" value="${d8}"/> |
| 222 </filterset> | 240 </filterset> |
| 223 </copy> | 241 </copy> |
| 224 <chmod file="${dist.dir}/bin/dartc_test" perm="a+rx"/> | 242 <chmod file="${dist.dir}/bin/dartc_test" perm="a+rx"/> |
| 225 | 243 |
| 226 <!-- | 244 <!-- |
| 227 TODO: The following files are not strictly due to dist, move them out. | 245 TODO: The following files are not strictly due to dist, move them out. |
| 228 --> | 246 --> |
| 229 <copy todir="${build.dir}"> | 247 <copy todir="${build.dir}"> |
| 230 <fileset dir="scripts"> | 248 <fileset dir="scripts"> |
| 231 <include name="dartc_run.sh"/> | 249 <include name="dartc_run.sh"/> |
| 232 <include name="dartc_size.sh"/> | 250 <include name="dartc_size.sh"/> |
| 233 <include name="dartc_metrics.sh"/> | 251 <include name="dartc_metrics.sh"/> |
| 234 </fileset> | 252 </fileset> |
| 235 <filterset> | 253 <filterset> |
| 236 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:${
dartc.classpath.runtime.unix}"/> | 254 <filter token="CLASSPATH" value="$DARTC_LIBS/dartc.jar:$DARTC_LIBS/corel
ib.jar:$DARTC_LIBS/domlib.jar:$DARTC_LIBS/htmllib.jar:$DARTC_LIBS/jsonlib.jar:$D
ARTC_LIBS/isolatelib.jar:${dartc.classpath.runtime.unix}"/> |
| 237 </filterset> | 255 </filterset> |
| 238 </copy> | 256 </copy> |
| 239 <chmod file="${build.dir}/dartc_run.sh" perm="a+rx"/> | 257 <chmod file="${build.dir}/dartc_run.sh" perm="a+rx"/> |
| 240 <chmod file="${build.dir}/dartc_size.sh" perm="a+rx"/> | 258 <chmod file="${build.dir}/dartc_size.sh" perm="a+rx"/> |
| 241 <chmod file="${build.dir}/dartc_metrics.sh" perm="a+rx"/> | 259 <chmod file="${build.dir}/dartc_metrics.sh" perm="a+rx"/> |
| 242 | 260 |
| 243 <!-- | 261 <!-- |
| 244 Copy of all of the dartc dependencies to the lib folder. | 262 Copy of all of the dartc dependencies to the lib folder. |
| 245 --> | 263 --> |
| 246 <copy todir="${dist.dir}/lib"> | 264 <copy todir="${dist.dir}/lib"> |
| 247 <path refid="classpath.runtime"/> | 265 <path refid="classpath.runtime"/> |
| 248 <regexpmapper from="${third_party.dir}/(.*)" to="\1"/> | 266 <regexpmapper from="${third_party.dir}/(.*)" to="\1"/> |
| 249 </copy> | 267 </copy> |
| 250 </target> | 268 </target> |
| 251 | 269 |
| 252 <target name="clean" description="Deletes the build output directory."> | 270 <target name="clean" description="Deletes the build output directory."> |
| 253 <delete dir="${build.dir}"/> | 271 <delete dir="${build.dir}"/> |
| 254 <delete dir="${dist.dir}"/> | 272 <delete dir="${dist.dir}"/> |
| 255 </target> | 273 </target> |
| 256 | 274 |
| 257 <target name="tests.jar" depends="compile-tests"> | 275 <target name="tests.jar" depends="compile-tests"> |
| 258 <jar destfile="${build.dir}/tests.jar" basedir="${build.test.classes.dir}"/> | 276 <jar destfile="${build.dir}/tests.jar" basedir="${build.test.classes.dir}"/> |
| 259 </target> | 277 </target> |
| 260 </project> | 278 </project> |
| OLD | NEW |