Changeset 1134
- Timestamp:
- 12/08/06 17:01:27
- Files:
-
- trunk/build/buildjar.xml (modified) (1 diff)
- trunk/deployment/build.xml (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/buildjar.xml
r952 r1134 80 80 </uptodate> 81 81 82 <antcall target="do.build.uptodate" inheritRefs="true" /> 83 <antcall target="do.build.notuptodate" inheritRefs="true" /> 84 </target> 82 <if> 83 <isset property="build.jar.uptodate"/> 84 <then> 85 <echo message="**** ${build.jar.file} is up to date" /> 86 </then> 87 </if> 85 88 86 <target name="do.build.notuptodate" 87 if="build.jar.uptodate"> 88 <echo message="**** ${build.jar.file} is up to date" /> 89 </target> 89 <if> 90 <not> 91 <isset property="build.jar.uptodate"/> 92 </not> 93 <then> 94 <echo message="**** ${build.jar.file} needs rebuilding" /> 90 95 91 <target name="do.build.uptodate" 92 unless="build.jar.uptodate"> 93 <echo message="**** ${build.jar.file} needs rebuilding" /> 96 <!-- Delete jar file --> 97 <delete file="${build.jar.file}"/> 94 98 95 <!-- Delete jar file --> 96 <delete file="${build.jar.file}"/> 99 <dirname property="build.jar.dir" file="${build.jar.file}"/> 97 100 98 <dirname property="build.jar.dir" file="${build.jar.file}"/>101 <mkdir dir="${build.jar.dir}" /> 99 102 100 <mkdir dir="${build.jar.dir}" /> 103 <!-- ========================================================== 104 Build the classes 105 ========================================================== --> 101 106 102 <!-- ============================================================== 103 Build the classes 104 ============================================================== --> 107 <!-- First copy the sources we are going to compile into a temp 108 directory. --> 109 <mkdir dir="${jar.temp.sources}" /> 110 <copy toDir="${jar.temp.sources}"> 111 <fileset refid="base.java.sources" /> 112 <fileset refid="base.resource.files"/> 113 </copy> 105 114 106 <!-- First copy the sources we are going to compile into a temp 107 directory. --> 108 <mkdir dir="${jar.temp.sources}" /> 109 <copy toDir="${jar.temp.sources}"> 110 <fileset refid="base.java.sources" /> 111 <fileset refid="base.resource.files"/> 112 </copy> 115 <mkdir dir="${jar.temp.classes}"/> 116 <echo message="About to build jar ${build.jar.file}"/> 117 <property name="cp" refid="compile.classpath" /> 118 <echo message="***************cp: ${cp}"/> 113 119 114 <mkdir dir="${jar.temp.classes}"/> 115 <echo message="About to build jar ${build.jar.file}"/> 116 <property name="cp" refid="compile.classpath" /> 117 <echo message="***************cp: ${cp}"/> 120 <javac srcdir="${jar.temp.sources}" 121 destdir="${jar.temp.classes}" 122 debug="${compile.debug}" 123 verbose="${compile.verbose}" 124 listfiles="${compile.listfiles}" 125 deprecation="${compile.deprecation}" 126 optimize="${compile.optimize}"> 127 <classpath refid="compile.classpath"/> 128 <include name="**/*.java"/> 129 <compilerarg value="-nowarn" compiler="jikes" /> 130 </javac> 118 131 119 <javac srcdir="${jar.temp.sources}" 120 destdir="${jar.temp.classes}" 121 debug="${compile.debug}" 122 verbose="${compile.verbose}" 123 listfiles="${compile.listfiles}" 124 deprecation="${compile.deprecation}" 125 optimize="${compile.optimize}"> 126 <classpath refid="compile.classpath"/> 127 <include name="**/*.java"/> 128 <compilerarg value="-nowarn" compiler="jikes" /> 129 </javac> 132 <!-- ========================================================== 133 Build jar file 134 ========================================================== --> 130 135 131 <!-- ============================================================== 132 Build jar file 133 ============================================================== --> 136 <jar jarfile="${build.jar.file}"> 137 <fileset dir="${jar.temp.classes}"> 138 <patternset refid="base.class.patternset"/> 139 </fileset> 140 <fileset refid="base.resource.files"/> 141 </jar> 134 142 135 <jar jarfile="${build.jar.file}"> 136 <fileset dir="${jar.temp.classes}"> 137 <patternset refid="base.class.patternset"/> 138 </fileset> 139 <fileset refid="base.resource.files"/> 140 </jar> 143 <!-- ========================================================== 144 Clean up 145 ========================================================== --> 141 146 142 <!-- ============================================================== 143 Clean up 144 ============================================================== --> 145 146 <delete dir="${jar.temp.sources}" /> 147 <delete dir="${jar.temp.classes}"/> 147 <delete dir="${jar.temp.sources}" /> 148 <delete dir="${jar.temp.classes}"/> 149 </then> 150 </if> 148 151 </target> 149 152 </project> trunk/deployment/build.xml
r997 r1134 137 137 <delete dir="${org.bedework.temp.wars.home}" /> 138 138 139 <antcall target="deploy.standalone.apps" inheritrefs="true" /> 140 141 <antcall target="deploy.shellscr.apps" inheritrefs="true" /> 142 143 <antcall target="deploy.portal.apps" inheritrefs="true" /> 144 145 <antcall target="deploy.j2ee.apps" inheritrefs="true" /> 139 <!--<antcall target="deploy.standalone.apps" inheritrefs="true" />--> 140 <if> 141 <isset property="org.bedework.global.build.standalone.app" /> 142 <then> 143 <antcall target="deploy.apps" inheritrefs="true" > 144 <param name="org.bedework.deploy.kind" value="webapp" /> 145 </antcall> 146 </then> 147 </if> 148 149 <!--<antcall target="deploy.shellscr.apps" inheritrefs="true" />--> 150 <!-- Always build the shellscr stuff.--> 151 <antcall target="deploy.apps" inheritrefs="true" > 152 <param name="org.bedework.deploy.kind" value="shellscr" /> 153 </antcall> 154 155 <!-- <antcall target="deploy.portal.apps" inheritrefs="true" />--> 156 <if> 157 <isset property="org.bedework.global.portal.platform" /> 158 <then> 159 <antcall target="deploy.apps" inheritrefs="true" > 160 <param name="org.bedework.deploy.kind" 161 value="${org.bedework.global.portal.platform}" /> 162 </antcall> 163 </then> 164 </if> 165 166 <!-- <antcall target="deploy.j2ee.apps" inheritrefs="true" />--> 167 <if> 168 <isset property="org.bedework.global.j2ee.platform" /> 169 <then> 170 <antcall target="deploy.apps" inheritrefs="true" > 171 <param name="org.bedework.deploy.kind" 172 value="${org.bedework.global.j2ee.platform}" /> 173 </antcall> 174 </then> 175 </if> 146 176 147 177 <!-- copy startup website that sends you to the applications --> … … 163 193 ================================================================= --> 164 194 195 <!-- 165 196 <target name="deploy.standalone.apps" if="org.bedework.global.build.standalone.app" > 166 197 <property name="org.bedework.deploy.kind" value="webapp" /> … … 179 210 <antcall target="deploy.apps" inheritrefs="true" /> 180 211 </target> 181 182 <!-- Always build the shellscr stuff. --> 212 --> 213 214 <!-- Always build the shellscr stuff. 183 215 <target name="deploy.shellscr.apps" > 184 216 <property name="org.bedework.deploy.kind" value="shellscr" /> 185 217 <antcall target="deploy.apps" inheritrefs="true" /> 186 218 </target> 219 --> 187 220 188 221 <!-- The cp.xalan task conditionally copies the xalan.jar file, if … … 247 280 projectPrefix="org.bedework.project"> 248 281 <sequential> 249 <antcall target=" wrap.deploy.available.app" inheritrefs="true" />282 <antcall target="deploy.available.app" inheritrefs="true" /> 250 283 </sequential> 251 284 </forEachApp> … … 261 294 </target> 262 295 296 <target name="deploy.available.app"> 297 <if> 298 <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml"/> 299 <then> 300 <propertyset id="deploy-app-properties"> 301 <propertyref prefix="org.bedework.app.${org.bedework.deploy.name}"/> 302 <globmapper from="org.bedework.app.${org.bedework.deploy.name}.*" to="propval.app.*"/> 303 </propertyset> 304 305 <ant antfile="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" 306 inheritrefs="true" target="deploy" > 307 <propertyset refid="deploy-app-properties" /> 308 </ant> 309 </then> 310 </if> 311 </target> 312 <!-- 263 313 <target name="wrap.deploy.available.app"> 264 314 <available file="${org.bedework.deploy.type.dir}/${org.bedework.deploy.kind}/build.xml" … … 279 329 </ant> 280 330 </target> 331 --> 281 332 </project> 282 333
