Project

General

Profile

« Previous | Next » 

Revision 4405

Added by daigle over 15 years ago

Make ecogrid deploy directories relative paths.

View differences:

build.xml
571 571
   	  <ant antfile="build.xml" dir="${ecogrid-dir}" target ="clean" inheritall="false">
572 572
   	         <property name="context" value="${metacat.context}"/>
573 573
   	   	     <property name="target" value="${ecogrid-target-name}"/>
574
   	   	     <property name="metacat.dir" value="${metacat.dir}"/>
574
   	   	     <!-- property name="metacat.dir" value="."/ -->
575 575
   	  </ant>
576 576
   	  <ant antfile="build.xml" dir="${ecogrid-dir}" target ="war" inheritall="false">
577 577
   	     <property name="context" value="${metacat.context}"/>
578 578
   	     <property name="target" value="${ecogrid-target-name}"/>
579
   	     <property name="metacat.dir" value="${metacat.dir}"/>
579
   	     <!-- property name="metacat.dir" value="."/ -->
580 580
   	  </ant>
581 581
   	  <war destfile="${ecogrid-dir}/build/${metacat.context}.war" update="true">
582 582
  	      <webinf dir="${ecogrid-dir}/lib">
......
598 598
   	 <ant antfile="build.xml" dir="${ecogrid-dir}" target ="deploy" inheritall="false">
599 599
   	   	 <property name="context" value="${metacat.context}"/>
600 600
   	   	 <property name="target" value="${ecogrid-target-name}"/>
601
   	     <property name="metacat.dir" value="${metacat.dir}"/>
601
   	     <property name="metacat.dir" value="."/>
602 602
   	     <property name="hostname" value="localhost"/>
603 603
   	     <property name="port" value="${config.port}"/>
604 604
   	 </ant>
......
729 729
   	   <mkdir dir="${war.context.temp}" />
730 730
       <mkdir dir="${war.context.templates}" />
731 731
       
732
   	   <!--copy file="${lib.dir}/${jdbc.lib.oracle}" todir="${war.lib}" / -->
733 732
	   <!--copy file="${lib.dir}/${jdbc.lib.postgres}" todir="${war.lib}" / -->
734 733
       <!--copy file="${lib.dir}/${jdbc.lib.sqlserver1}" todir="${war.lib}" / -->
735 734
       <!--copy file="${lib.dir}/${jdbc.lib.sqlserver2}" todir="${war.lib}" / -->

Also available in: Unified diff