Project

General

Profile

« Previous | Next » 

Revision 2461

Added by sgarg over 19 years ago

Added code which checks out utilities from cvs. Modified distsrc to include utilities src also. Changed version from 1.4 to 1.5

View differences:

build.xml
161 161
      <property name="name"                value="metacat"/>
162 162
      <property name="Name"                value="MetaCat"/>
163 163
      <property name="debugprefix"         value="${Name}:"/>
164
      <property name="release"             value="1.4.0"/>
164
      <property name="release"             value="1.5.0"/>
165 165
      <property name="replication-path"    value="/${context}/servlet/replication"/>
166 166
      <property name="harvester-registration-login-path" value="/${context}/harvesterRegistrationLogin"/>
167 167
      <property name="harvester-registration-path"       value="/${context}/harvesterRegistration"/>
......
182 182
      <property name="replication-log"     value="/tmp/metacatreplication.log"/>
183 183
      <property name="replicationerrorlog" value="/tmp/metacatreplication.err"/>
184 184
      <property name="config-dir"          value="${webapps}/${style-skins-path}" />
185
      <property name="util-module"         value="utilities" />
185 186
      <property name="eml-module"          value="eml" />
186 187
      <property name="eml-version"         value="2.0.0beta6" />
187 188
      <property name="eml-tag"             value="EML_2_0_0_BETA_6_FOR_METACAT" />
......
239 240
      <filter token="ldap_password"        value="ldap_password"/>
240 241
      <filter token="mailhost"             value="smtp.ecoinformatics.org"/>
241 242
      <filter token="sender"               value="knb-software\@nceas.ucsb.edu"/>
242
      <filter token="cgiurl"               value="http://${server}/cgi-bin/ldapweb.cgi"/>   
243
      <filter token="cgiurl"               value="http://${server}/cgi-bin/ldapweb.cgi"/>
243 244

  
244 245
      <property name="cpath"
245 246
                value="${xmlp}:${xalan}:${apis}:${jdbc}:${jsdk}:${cos}:${morpho}:${emlparser}:${jdbc-add1}:${jdbc-add2}:${util}:${httpclient}"/>
......
331 332
      <property name="dist.dir" value="dist"/>
332 333
      <property name="ver.dir" value="${dist.dir}/${name}-${release}"/>
333 334
      <property name="ver.src" value="${ver.dir}/src"/>
335
      <property name="util.dir" value="${dist.dir}/${util-module}"/>
334 336
	  <!-- directories for creating a Harvest List Editor distribution -->
335 337
      <property name="dist.dir.hle" value="disthle"/>
336 338
      <property name="ver.dir.hle" value="${dist.dir.hle}/harvest-list-editor-${release}"/>
......
403 405
     <copy file="${utilitiesdir}/build/utilities.jar" todir="lib" />
404 406
   </target>
405 407

  
408
   <target name="getutilities" depends="prepare"
409
   description="Checks utility out of cvs and copies it to your metacat cvs sandbox">
410
     <echo>Enter CVS password: </echo>
411
     <cvs cvsRoot="${cvsroot}"
412
          package="${utilities-module}"
413
          dest="${build.tmp}" />
414
   </target>
415

  
406 416
   <target name="client" depends="utilities, prepare"
407 417
    description="Compiles metacat-client java code to build dir">
408 418
       <javac srcdir="${build.src}"
......
520 530
     </antcall>
521 531
   </target>
522 532

  
523

  
524

  
525 533
   <target  name="copyxsl"
526 534
   description="Copies xsl stylesheets from checkout in build/tmp to your metacat cvs sandbox">
527 535

  
......
607 615
   <target name="upgrade15" depends="sqlupgrade15"
608 616
           description="Updates the database tables to upgrade to version 1.5">
609 617
     <echo/>
610
     <echo>Updating the database tables to upgrade to version 1.4...</echo>
618
     <echo>Updating the database tables to upgrade to version 1.5...</echo>
611 619
     <copy file="${srcdir}/upgrade_db_to_1_5.java"
612 620
           todir="${build.tmp}" filtering="yes"/>
613
 
621

  
614 622
     <javac srcdir="${build.tmp}"
615 623
            destdir="${build.tmp}"
616 624
            classpath="${cpath}"
617 625
            debug="${debug}"
618 626
            includes="upgrade_db_to_1_5.java"/>
619
 
627

  
620 628
     <java classname="upgrade_db_to_1_5"
621 629
           classpath="${cpath}:${build.tmp}"/>
622 630

  
623 631
   </target>
624
   
632

  
625 633
   <target name="sqlupgrade15" depends="prepare">
626 634
      <echo>Updating the database tables to upgrade to version 1.5 by sql command</echo>
627 635
      <sql driver="${dbDriver}"
......
1008 1016
       />
1009 1017
   </target>
1010 1018

  
1011
   <target name="dist" depends="geteml,jar,protocol,jdoc"
1019
   <target name="dist"
1020
       depends="geteml,jar,protocol,jdoc,getConversionXSL,getutilities"
1012 1021
            description="prepares a full release distribution">
1013 1022
      <mkdir dir="${dist.dir}"/>
1014 1023
      <delete dir="${ver.dir}" />
......
1054 1063
      <copy todir="${ver.src}">
1055 1064
        <fileset dir="./src"/>
1056 1065
      </copy>
1066
      <mkdir dir="${util.dir}"/>
1067
      <copy todir="${util.dir}">
1068
        <fileset dir="${build.tmp}/utilities" excludes="**/CVS*" />
1069
      </copy>
1057 1070

  
1058 1071
      <delete file="./${name}-src-${release}.zip"/>
1059 1072
      <zip zipfile="./${name}-src-${release}.zip" basedir="${dist.dir}"/>

Also available in: Unified diff