Project

General

Profile

Revision 882

Updated documentation to reflect new installprocess.

Modified build.xml to properly copy the docs into the distribution, which
required some changes in the ant token filtering scheme.

View differences:

build.xml
40 40
      <property name="release" value="1.0.1"/>
41 41
      <property name="web-base-url" 
42 42
                value="http://knb.ecoinformatics.org"/>
43
      <property name="replication-path" value="/servlet/replication"/>
43
      <property name="replication-path" value="/jones/servlet/replication"/>
44 44
      <property name="servlet-path" value="/jones/servlet/metacat"/>
45 45
      <property name="html-path" value="/jones"/>
46 46
      <property name="image-path" value="/img/jones" />
47 47
      <property name="style-path" value="/jones/style"/>
48
      <property name="server" value="dev.nceas.ucsb.edu"/>
48
      <property name="serverhost" value="dev.nceas.ucsb.edu"/>
49
      <property name="server" value="http://${serverhost}"/>
49 50
      <property name="replication-log" value="/tmp/metacatreplication.log"/>
50 51
      <property name="user" value="jones"/>
51 52
      <property name="password" value="your-pw-goes-here"/>
......
57 58
      <property name="cvsroot" 
58 59
                value=":ext:jones@cvs.nceas.ucsb.edu:/cvs/pbi" />
59 60

  
61

  
62
      <filter token="docrooturl" value="./" />
60 63
      <filter token="jdbc-connect" value="${jdbc-connect}"/>
64
      <filter token="dbDriver" value="${dbDriver}"/>
61 65
      <filter token="install-dir" value="${installdir}"/>
66
      <filter token="serverhost" value="${serverhost}"/>
62 67
      <filter token="server" value="${server}"/>
63 68
      <filter token="replication-log" value="${replication-log}"/>
64 69
      <filter token="release" value="${release}"/>
......
85 90
      <property name="build.javadocs" value="${build.dir}/docs/api"/>
86 91
      <property name="build.img" value="/opt/httpd/html${image-path}"/>
87 92

  
88
      <property name="dist.dir" value="./dist"/>
93
      <property name="dist.dir" value="dist"/>
89 94
      <property name="ver.dir" value="${dist.dir}/${name}-${release}"/>
90 95
      <property name="ver.src" value="${ver.dir}/src"/>
91 96

  
......
256 261
      <delete dir="${ver.dir}" />
257 262
      <mkdir dir="${ver.dir}"/>
258 263
      <copy todir="${ver.dir}">
259
        <fileset dir="." excludes="**/CVS* **/.#* **/src* **/test* **/build*"/>
264
        <fileset dir="." 
265
            excludes="**/CVS* **/.#* **/src* **/test* **/build* **/docs* ${dist.dir}"/>
260 266
      </copy>
261 267
      <copy todir="${ver.dir}" file="build.xml"/>
262 268
      <copy todir="${ver.dir}/lib" file="${build.dir}/metacat.jar"/>
263 269
      <copy todir="${ver.dir}/lib" file="${build.dir}/protocol.jar"/>
270

  
271
      <copy todir="${ver.dir}/docs" filtering="yes">
272
        <fileset dir="docs" excludes="**/*gif **/*jpg **/*png" />
273
      </copy>
274
      <copy todir="${ver.dir}/docs" filtering="no">
275
        <fileset dir="docs" includes="**/*gif **/*jpg **/*png" />
276
      </copy>
264 277
      <copy todir="${ver.dir}/docs/dev">
265 278
        <fileset dir="${build.dir}/docs"/>
266 279
      </copy>
267 280
       
268
      <delete file="./lib/${name}-${release}.zip"/>
269
      <zip zipfile="./lib/${name}-${release}.zip" basedir="${dist.dir}"/>
270
      <delete file="./lib/${name}-${release}.tar.gz" />
271
      <tar tarfile="./lib/${name}-${release}.tar" basedir="${dist.dir}"/>
272
      <gzip zipfile="./lib/${name}-${release}.tar.gz" 
273
                src="./lib/${name}-${release}.tar"/>
274
      <delete file="./lib/${name}-${release}.tar" />
281
      <delete file="./${name}-${release}.zip"/>
282
      <zip zipfile="./${name}-${release}.zip" basedir="${dist.dir}"/>
283
      <delete file="./${name}-${release}.tar.gz" />
284
      <tar tarfile="./${name}-${release}.tar" basedir="${dist.dir}"/>
285
      <gzip zipfile="./${name}-${release}.tar.gz" 
286
                src="./${name}-${release}.tar"/>
287
      <delete file="./${name}-${release}.tar" />
275 288
  </target> 
276 289

  
277 290
  <target name="distsrc" depends="dist">
......
280 293
        <fileset dir="./src"/>
281 294
      </copy>
282 295

  
283
      <delete file="./lib/${name}-src-${release}.zip"/>
284
      <zip zipfile="./lib/${name}-src-${release}.zip" basedir="${dist.dir}"/>
285
      <delete file="./lib/${name}-src-${release}.tar.gz" />
286
      <tar tarfile="./lib/${name}-src-${release}.tar" basedir="${dist.dir}"/>
287
      <gzip zipfile="./lib/${name}-src-${release}.tar.gz" 
288
                src="./lib/${name}-src-${release}.tar"/>
289
      <delete file="./lib/${name}-src-${release}.tar" />
296
      <delete file="./${name}-src-${release}.zip"/>
297
      <zip zipfile="./${name}-src-${release}.zip" basedir="${dist.dir}"/>
298
      <delete file="./${name}-src-${release}.tar.gz" />
299
      <tar tarfile="./${name}-src-${release}.tar" basedir="${dist.dir}"/>
300
      <gzip zipfile="./${name}-src-${release}.tar.gz" 
301
                src="./${name}-src-${release}.tar"/>
302
      <delete file="./${name}-src-${release}.tar" />
290 303
      <delete dir="${dist.dir}"/>
291 304
  </target> 
292 305

  

Also available in: Unified diff