Project

General

Profile

Revision 4720

Added by daigle about 12 years ago

change dev-install target to be install target

View differences:

build.xml
55 55
      <property name="debug"               value="on" />
56 56
      <property name="morphosourcedir"     value="../morpho" />
57 57
      <property name="utilitiesdir"        value="../utilities" />
58
      <property name="installdir"        value="${dev.deploy.dir}/${metacat.context}" />
58
      <property name="installdir"        value="${app.deploy.dir}/${metacat.context}" />
59 59

  
60 60
      <echo>*********** set jsdk to ${jsdk}</echo>
61 61
  </target>
......
568 568

  
569 569
    </target>
570 570

  
571
   <target name="dev-install" depends="clean, build-metacat" description="* Full Install For Development *">
572
     <copy file="${dist.dir}/${metacat.context}.war" todir="${dev.deploy.dir}"/>
573
   	 <delete dir="${dev.deploy.dir}/${metacat.context}" />
571
   <target name="install" depends="clean, build-metacat" description="* Full Install For Development *">
572
     <copy file="${dist.dir}/${metacat.context}.war" todir="${app.deploy.dir}"/>
573
   	 <delete dir="${app.deploy.dir}/${metacat.context}" />
574 574
   	   <tstamp>
575 575
   	   	 <format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa"/>
576 576
   	   </tstamp>
577 577
   	 <echo>Dev install completed at ${NOW}</echo> 	   	
578 578
   </target>
579 579

  
580
<!--
581
   <target name="install" depends="install-ecogrid" description="* Full Install *">
582
       <mkdir dir="${datafilepath}" />
583
       <mkdir dir="${inlinedatafilepath}" />
584
       <chmod dir="${datafilepath}" perm="ug+w" />
585
       <mkdir dir="${temp-dir}"/>
586
       <chmod dir="${temp-dir}" perm="ug+w" />
587
       <copy file="${dist.dir}/${metacat.context}.war" todir="${deploy.dir}"/>
588
   	   <echo>If you enable ecogrid installation, please run "ant deploy-ecogrid" when installation or upgrade is done</echo> 
589
   </target>
590
-->
591 580
   <target name="build-metacat" depends="install-ecogrid"
592 581
   	            description="Build Metacat">
593 582
   </target>
......
631 620
   </target>
632 621
	
633 622
   <target name="clean-ecogrid-server-config-wsdd" depends="init" description="Automately generate wsdd for ecogrid service">
634
      <delete file="${dev.deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd"/>
623
      <delete file="${app.deploy.dir}/${metacat.context}/WEB-INF/server-config.wsdd"/>
635 624
   </target>
636 625

  
637 626
   <!-- target name="install-registry" depends="init,getConversionXSL"
......
1018 1007
   </target>
1019 1008

  
1020 1009
   <!-- run this target, we need to check out a another morpho souce dir was checked out. -->
1021
   <target name="nettest" depends="dev-install"
1010
   <target name="nettest" depends="install"
1022 1011
            description="compiles and runs the metacatnettest code">
1023 1012

  
1024 1013
      <echo>***********************************
......
1413 1402
    <target name="deploy-lsid"
1414 1403
            depends="war-lsid"
1415 1404
            description="Deploy LSID war to servlet container">
1416
        <delete dir="${dev.deploy.dir}/${authority.context}" />
1417
        <delete file="${dev.deploy.dir}/${authority.context}.war" />
1418
        <mkdir dir="${dev.deploy.dir}" />
1419
        <copy todir="${dev.deploy.dir}">
1405
        <delete dir="${app.deploy.dir}/${authority.context}" />
1406
        <delete file="${app.deploy.dir}/${authority.context}.war" />
1407
        <mkdir dir="${app.deploy.dir}" />
1408
        <copy todir="${app.deploy.dir}">
1420 1409
            <fileset dir="${dist.dir}" />
1421 1410
        </copy>
1422 1411
    </target>

Also available in: Unified diff