aoo-ant.xml (11e97782) | aoo-ant.xml (4aa87146) |
---|---|
1<?xml version="1.0" encoding="UTF-8"?> 2<!--*********************************************************** 3 * 4 * Licensed to the Apache Software Foundation (ASF) under one 5 * or more contributor license agreements. See the NOTICE file 6 * distributed with this work for additional information 7 * regarding copyright ownership. The ASF licenses this file 8 * to you under the Apache License, Version 2.0 (the --- 21 unchanged lines hidden (view full) --- 30 <dirname property="aoo-ant.basedir" file="${ant.file.aoo-ant}"/> 31 32 <!-- global properties --> 33 <property file="${aoo-ant.basedir}/../../ant.properties"/> 34 <!-- RSCREVISION: --> 35 <property file="${aoo-ant.basedir}/../inc/minor.mk"/> 36 37 <property name="build.base.dir" location="${WORKDIR}/Ant/${ant.project.name}"/> | 1<?xml version="1.0" encoding="UTF-8"?> 2<!--*********************************************************** 3 * 4 * Licensed to the Apache Software Foundation (ASF) under one 5 * or more contributor license agreements. See the NOTICE file 6 * distributed with this work for additional information 7 * regarding copyright ownership. The ASF licenses this file 8 * to you under the Apache License, Version 2.0 (the --- 21 unchanged lines hidden (view full) --- 30 <dirname property="aoo-ant.basedir" file="${ant.file.aoo-ant}"/> 31 32 <!-- global properties --> 33 <property file="${aoo-ant.basedir}/../../ant.properties"/> 34 <!-- RSCREVISION: --> 35 <property file="${aoo-ant.basedir}/../inc/minor.mk"/> 36 37 <property name="build.base.dir" location="${WORKDIR}/Ant/${ant.project.name}"/> |
38 |
|
38 <property name="main.src.dir" location="src/main/java"/> | 39 <property name="main.src.dir" location="src/main/java"/> |
39 <property name="main.build.dir" location="${build.base.dir}/main"/> | 40 <property name="idl.src.dir" location="src/main/idl"/> |
40 <property name="test.src.dir" location="src/test/java"/> | 41 <property name="test.src.dir" location="src/test/java"/> |
42 <property name="test-idl.src.dir" location="src/test/idl"/> 43 44 <property name="main.build.dir" location="${build.base.dir}/main"/> 45 <property name="idl.build.dir" location="${build.base.dir}/idl"/> 46 <property name="idl.build.classes.dir" location="${build.base.dir}/idl/classes"/> |
|
41 <property name="test.build.dir" location="${build.base.dir}/test"/> | 47 <property name="test.build.dir" location="${build.base.dir}/test"/> |
48 <property name="test-idl.build.dir" location="${build.base.dir}/test-idl"/> 49 <property name="test-idl.classes.build.dir" location="${build.base.dir}/test-idl/classes"/> |
|
42 <property name="test.reports.dir" location="${build.base.dir}/test-reports"/> | 50 <property name="test.reports.dir" location="${build.base.dir}/test-reports"/> |
51 |
|
43 <property name="java.baseline.version" value="1.7"/> 44 <property name="jar.dir" location="${WORKDIR}/Ant"/> 45 46 <property name="main.debug" value="true"/> 47 <property name="main.deprecation" value="false"/> 48 <property name="test.debug" value="true"/> 49 <property name="test.deprecation" value="false"/> 50 --- 7 unchanged lines hidden (view full) --- 58 <property name="jar.name" value="${ant.project.name}"/> 59 <property name="jar.classpath" value=""/> 60 <property name="jar.manifest" value ="${aoo-ant.basedir}/manifest.empty"/> 61 62 <local name="has.main.classpath"/> 63 <condition property="has.main.classpath"> 64 <isreference refid="main.classpath"/> 65 </condition> | 52 <property name="java.baseline.version" value="1.7"/> 53 <property name="jar.dir" location="${WORKDIR}/Ant"/> 54 55 <property name="main.debug" value="true"/> 56 <property name="main.deprecation" value="false"/> 57 <property name="test.debug" value="true"/> 58 <property name="test.deprecation" value="false"/> 59 --- 7 unchanged lines hidden (view full) --- 67 <property name="jar.name" value="${ant.project.name}"/> 68 <property name="jar.classpath" value=""/> 69 <property name="jar.manifest" value ="${aoo-ant.basedir}/manifest.empty"/> 70 71 <local name="has.main.classpath"/> 72 <condition property="has.main.classpath"> 73 <isreference refid="main.classpath"/> 74 </condition> |
66 <path id="main.classpath" unless:set="has.main.classpath"/> | 75 <path id="internal.main.classpath"> 76 <path refid="main.classpath" if:set="has.main.classpath"/> 77 <pathelement location="${idl.classes.build.dir}"/> 78 </path> |
67 68 <local name="has.test.classpath"/> 69 <condition property="has.test.classpath"> 70 <isreference refid="test.classpath"/> 71 </condition> 72 <path id="internal.test.classpath"> 73 <pathelement location="${main.build.dir}"/> | 79 80 <local name="has.test.classpath"/> 81 <condition property="has.test.classpath"> 82 <isreference refid="test.classpath"/> 83 </condition> 84 <path id="internal.test.classpath"> 85 <pathelement location="${main.build.dir}"/> |
86 <pathelement location="${idl.classes.build.dir}"/> |
|
74 <pathelement location="${test.build.dir}"/> | 87 <pathelement location="${test.build.dir}"/> |
88 <pathelement location="${test-idl.classes.build.dir}"/> |
|
75 <path refid="main.classpath"/> 76 <path refid="test.classpath" if:set="has.test.classpath"/> | 89 <path refid="main.classpath"/> 90 <path refid="test.classpath" if:set="has.test.classpath"/> |
77 <pathelement location="${idl.classes.build.dir}"/> | |
78 <pathelement location="${OOO_JUNIT_JAR}"/> 79 <pathelement location="${HAMCREST_CORE_JAR}" if:set="HAMCREST_CORE_JAR"/> 80 </path> | 91 <pathelement location="${OOO_JUNIT_JAR}"/> 92 <pathelement location="${HAMCREST_CORE_JAR}" if:set="HAMCREST_CORE_JAR"/> 93 </path> |
81 82 <local name="has.idl.files"/> 83 <condition property="has.idl.files"> 84 <isreference refid="idl.files"/> 85 </condition> 86 <filelist id="idl.files" unless:set="has.idl.files"/> | |
87 </target> 88 89 <target name="res" depends="prepare"> 90 <mkdir dir="${main.build.dir}"/> 91 <copy todir="${main.build.dir}"> 92 <fileset dir="${main.src.dir}"> 93 <include name="**/*.properties"/> 94 <include name="**/*.css"/> --- 9 unchanged lines hidden (view full) --- 104 <include name="**/*.xsl"/> 105 <include name="**/*.map"/> 106 </fileset> 107 </copy> 108 </target> 109 110 <extension-point name="pre-compile" depends="prepare,res"/> 111 | 94 </target> 95 96 <target name="res" depends="prepare"> 97 <mkdir dir="${main.build.dir}"/> 98 <copy todir="${main.build.dir}"> 99 <fileset dir="${main.src.dir}"> 100 <include name="**/*.properties"/> 101 <include name="**/*.css"/> --- 9 unchanged lines hidden (view full) --- 111 <include name="**/*.xsl"/> 112 <include name="**/*.map"/> 113 </fileset> 114 </copy> 115 </target> 116 117 <extension-point name="pre-compile" depends="prepare,res"/> 118 |
112 <target name="compile" depends="pre-compile"> | 119 <target name="idl" depends="pre-compile"> 120 <fileset id="idl.files" dir="${idl.src.dir}" includes="**/*.idl" erroronmissingdir="false"/> 121 <idl-javamaker 122 idlFiles="idl.files" 123 idlBuildDir="${idl.build.dir}"/> 124 </target> 125 126 <target name="compile" depends="idl"> |
113 <mkdir dir="${main.build.dir}"/> 114 <javac srcdir="${main.src.dir}" 115 destdir="${main.build.dir}" 116 source="${java.baseline.version}" 117 target="${java.baseline.version}" 118 debug="${main.debug}" 119 debuglevel="lines,vars,source" 120 deprecation="${main.deprecation}" | 127 <mkdir dir="${main.build.dir}"/> 128 <javac srcdir="${main.src.dir}" 129 destdir="${main.build.dir}" 130 source="${java.baseline.version}" 131 target="${java.baseline.version}" 132 debug="${main.debug}" 133 debuglevel="lines,vars,source" 134 deprecation="${main.deprecation}" |
121 classpathref="main.classpath" | 135 classpathref="internal.main.classpath" |
122 includeantruntime="false"/> 123 </target> 124 125 <macrodef name="check-test"> 126 <sequential> 127 <local name="tests.present"/> 128 <available type="dir" file="${test.src.dir}" property="tests.present"/> 129 <echo message="No tests" unless:set="tests.present"/> --- 11 unchanged lines hidden (view full) --- 141 <or> 142 <not><isset property="tests.present"/></not> 143 <not><isset property="OOO_JUNIT_JAR"/></not> 144 </or> 145 </condition> 146 </sequential> 147 </macrodef> 148 | 136 includeantruntime="false"/> 137 </target> 138 139 <macrodef name="check-test"> 140 <sequential> 141 <local name="tests.present"/> 142 <available type="dir" file="${test.src.dir}" property="tests.present"/> 143 <echo message="No tests" unless:set="tests.present"/> --- 11 unchanged lines hidden (view full) --- 155 <or> 156 <not><isset property="tests.present"/></not> 157 <not><isset property="OOO_JUNIT_JAR"/></not> 158 </or> 159 </condition> 160 </sequential> 161 </macrodef> 162 |
149 <target name="test-compile" depends="compile,idl"> | 163 <target name="test-idl" depends="pre-compile"> 164 <fileset id="test-idl.files" dir="${test-idl.src.dir}" includes="**/*.idl" erroronmissingdir="false"/> 165 <idl-javamaker 166 idlFiles="test-idl.files" 167 idlBuildDir="${test-idl.build.dir}"/> 168 </target> 169 170 <target name="test-compile" depends="compile,test-idl"> |
150 <check-test/> 151 <mkdir dir="${test.build.dir}" unless:set="test.skip"/> 152 <javac srcdir="${test.src.dir}" 153 destdir="${test.build.dir}" 154 source="${java.baseline.version}" 155 target="${java.baseline.version}" 156 debug="${test.debug}" 157 debuglevel="lines,vars,source" --- 15 unchanged lines hidden (view full) --- 173 <include name="**/*_Test.java"/> 174 </fileset> 175 </batchtest> 176 </junit> 177 </target> 178 179 <target name="jar" depends="compile" if="${jar.enabled}"> 180 <jar destfile="${jar.dir}/${jar.name}.jar" | 171 <check-test/> 172 <mkdir dir="${test.build.dir}" unless:set="test.skip"/> 173 <javac srcdir="${test.src.dir}" 174 destdir="${test.build.dir}" 175 source="${java.baseline.version}" 176 target="${java.baseline.version}" 177 debug="${test.debug}" 178 debuglevel="lines,vars,source" --- 15 unchanged lines hidden (view full) --- 194 <include name="**/*_Test.java"/> 195 </fileset> 196 </batchtest> 197 </junit> 198 </target> 199 200 <target name="jar" depends="compile" if="${jar.enabled}"> 201 <jar destfile="${jar.dir}/${jar.name}.jar" |
181 basedir="${main.build.dir}" 182 manifest="${jar.manifest}"> | 202 manifest="${jar.manifest}" 203 duplicate="fail"> |
183 <manifest> 184 <attribute name="Class-Path" value="${jar.classpath}" unless:blank="${jar.classpath}"/> 185 <attribute name="Solar-Version" value="${RSCREVISION}"/> 186 </manifest> | 204 <manifest> 205 <attribute name="Class-Path" value="${jar.classpath}" unless:blank="${jar.classpath}"/> 206 <attribute name="Solar-Version" value="${RSCREVISION}"/> 207 </manifest> |
208 <fileset dir="${main.build.dir}"/> 209<!-- Breaks trunk/test/smoketestdoc by packaging different classes with the same name: --> 210<!-- <fileset dir="${idl.build.classes.dir}" erroronmissingdir="false"/> --> |
|
187 <include name="**/*.class"/> 188 <include name="**/*.properties"/> 189 <include name="**/*.css"/> 190 <include name="**/*.dtd"/> 191 <include name="**/*.form"/> 192 <include name="**/*.gif "/> 193 <include name="**/*.htm"/> 194 <include name="**/*.html"/> --- 20 unchanged lines hidden --- | 211 <include name="**/*.class"/> 212 <include name="**/*.properties"/> 213 <include name="**/*.css"/> 214 <include name="**/*.dtd"/> 215 <include name="**/*.form"/> 216 <include name="**/*.gif "/> 217 <include name="**/*.htm"/> 218 <include name="**/*.html"/> --- 20 unchanged lines hidden --- |