Project

General

Profile

« Previous | Next » 

Revision 5872

include geoserver.war in the 'install' target but also allow 'bypass' option when geoserver is not deployed next to metacat

View differences:

build.xml
753 753
				<include name="**" />
754 754
			</fileset>
755 755
		</copy>
756
		
757
		<copy todir="${dist.dir}">
758
			<fileset dir="./lib/spatial/geoserver" includes="*.war" />
759
		</copy>
756 760

  
757 761
	</target>
758 762

  
......
764 768
                        todir="${app.deploy.dir2}" />-->
765 769
		<delete dir="${app.deploy.dir}/${metacat.context}" />
766 770
		<!--<delete dir="${app.deploy.dir2}/${metacat.context}" />-->
771
		<copy file="${dist.dir}/geoserver.war"
772
					todir="${app.deploy.dir}" />
767 773
		<tstamp>
768 774
			<format property="NOW" pattern="MM/dd/yyyy hh:mm:ss aa" />
769 775
		</tstamp>
770 776
		<echo>Dev install completed at ${NOW}</echo>
771 777
	</target>
772 778

  
773
	<target name="build-metacat" depends="install-ecogrid"
779
	<target name="build-metacat" depends="install-ecogrid, install-spatial"
774 780
		description="Build Metacat">
775 781
	</target>
776 782

  
......
1317 1323
		<copy todir="${dist.dir}">
1318 1324
			<fileset dir="./src/scripts" />
1319 1325
		</copy>
1320
		<copy todir="${dist.dir}">
1321
			<fileset dir="./lib/spatial/geoserver" includes="*.war" />
1322
		</copy>
1323 1326
		<delete file="./${name}-bin-${release}.zip" />
1324 1327
		<zip zipfile="./${name}-bin-${release}.zip"
1325 1328
			basedir="${dist.dir}" excludes="metacat-*/**" />

Also available in: Unified diff