Commits

tbrugz committed 7511814

build: ivy: added 'main' configuration

  • Participants
  • Parent commits 92120e5

Comments (0)

Files changed (2)

 	<property name="deploy.dir" value="dist/deploy"/>
 	<property name="test.dir" value="dist/test"/>
 	<property name="web.dir" value="web"/>
-	<property name="war.file" value="${dist.dir}/${proj.name}.war"/>
+	<property name="war.file" value="dist/${proj.name}.war"/>
 
 	<fileset id="fileset.base" dir="lib">
 		<include name="sqldump.jar" />
 	</target>
 	
 	<target name="clean">
+		<delete dir="${bin.dir}"/>
 		<delete dir="${dist.dir}"/>
-		<mkdir dir="${dist.dir}"/>
+		<delete dir="${test.dir}"/>
 	</target>
 
 	<target name="compile" depends="prepare">
-		<javac destdir="${bin.dir}" classpathref="classpath.compile" debug="on" source="1.6" target="1.6">
+		<javac destdir="${bin.dir}" classpathref="classpath.test" debug="on" source="1.6" target="1.6">
 			<src path="${src.dir}"/>
 			<src path="${src.test.dir}"/>
 		</javac>
 		<ivy:retrieve haltonfailure="false"/>
 	</target>
 
-	<target name="publish" depends="jar,war,config-ivy" description="publish this project in the ivy repository">
+	<target name="publish" depends="jar,config-ivy" description="publish this project in the ivy repository">
 		<property name="revision" value="${version}"/>
 		
 		<!-- default publish options -->
 		<ivy:info/>
 		<property name="ivy.pom.version" value="${revision}"/>
 		<ivy:makepom ivyfile="ivy.xml" pomfile="dist/${ivy.module}.pom"/>
-		<ivy:publish resolver="${resolver.publish}" pubrevision="${revision}" status="release" update="true" overwrite="true">
+		<ivy:publish resolver="${resolver.publish}" pubrevision="${revision}" status="release" update="true" overwrite="true" conf="main">
 			<artifacts pattern="${dist.dir}/[module].[ext]" />
 			<artifact name="${ivy.module}" ext="pom" type="pom" />
 		</ivy:publish>
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
 	<info organisation="org.bitbucket.tbrugz" module="queryon"/>
+	<configurations>
+		<conf name="main"/>
+	</configurations>
 	<publications>
-		<artifact name="queryon" type="jar"/>
+		<artifact name="queryon" type="jar" conf="main"/>
 		<!-- artifact name="queryon" type="war"/ -->
 	</publications>
 	<dependencies>