1. tbrugz
  2. sqldump

Commits

tbrugz  committed 9f9a6ce

build: added mondrianschema2graphml v0.5.0 as ivy dependency (& simplifying build)

  • Participants
  • Parent commits 2e9f4c5
  • Branches default

Comments (0)

Files changed (4)

File .classpath

View file
  • Ignore whitespace
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/kmlutils-0.5.0.jar"/>
-	<classpathentry kind="lib" path="lib/mondrianschema2graphml.jar"/>
+	<classpathentry kind="lib" path="lib/mondrianschema2graphml-0.5.0.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.10.jar"/>
 	<classpathentry kind="output" path="bin/main"/>
 </classpath>

File build.xml

View file
  • Ignore whitespace
 	<path id="classpath.compile">
 		<pathelement location="${lib.dir}/commons-logging-1.1.1.jar"/>
 		<pathelement location="${lib.dir}/log4j-1.2.16.jar"/>
-		<pathelement location="${lib.dir}/kmlutils.jar"/>
-		<pathelement location="${lib.dir}/mondrianschema2graphml.jar"/>
+		<pathelement location="${lib.dir}/kmlutils-0.5.0.jar"/>
+		<pathelement location="${lib.dir}/mondrianschema2graphml-0.5.0.jar"/>
 	</path>
 
 	<path id="classpath.compiletest">
 		<get dest="${lib.dir}/kmlutils.jar" src="http://cdn.bitbucket.org/tbrugz/kmlutils/downloads/svg2kml.jar" verbose="true"/>
 	</target-->
 
-	<target name="check-mondrianschema2graphml" description="checks existence of mondrianschema2graphml.jar">
+	<!--target name="check-mondrianschema2graphml" description="checks existence of mondrianschema2graphml.jar">
 		<available file="${lib.dir}/mondrianschema2graphml.jar" property="mondrianschema2graphml.present"/>
 	</target>
 	
 	</target>
 	
 	<target name="resolve-base" depends="resolve-mondrianschema2graphml">
-	</target>
+	</target-->
 
-	<target name="resolve-ivy" description="retrieve dependencies with ivy" depends="resolve-base">
-		<ivy:retrieve />
-		<!--ivy:report todir="${dist.dir}" /-->
+	<target name="config-ivy" if="ivy.settings.dir">
+		<ivy:settings file="${ivy.settings.dir}/ivysettings.xml"/>
 	</target>	
 
-	<target name="resolve-get" description="retrieve dependencies with 'get'" depends="resolve-base">
+	<target name="resolve-ivy" depends="config-ivy" description="retrieve dependencies with ivy">
+		<ivy:retrieve />
+	</target>	
+
+	<!--target name="resolve-get" description="retrieve dependencies with 'get'" depends="resolve-base">
 		<get dest="${lib.dir}">
 			<url url="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
 			<url url="http://repo1.maven.org/maven2/log4j/log4j/1.2.16/log4j-1.2.16.jar"/>
 		</get>
-		<!-- markdownj: markdown testing -->
+		<!- - markdownj: markdown testing - ->
 		<get dest="${lib.dir}/markdownj-1.0.2b4-0.3.0.jar" src="http://code.google.com/p/markdownj/downloads/detail?name=markdownj-1.0.2b4-0.3.0.jar&amp;can=2&amp;q=" verbose="true"/>
-	</target>
+	</target-->
 	
 	<target name="report-ivy" depends="resolve-ivy">
 		<echo message="ivy.settings.dir = ${ivy.settings.dir}" />
 		<ivy:report todir="bin/report-ivy"/>
 	</target>
 	
-	<target name="publish" depends="jar" 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}"/>
-		<!--
-		<ivy:retrieve />
-		<ivy:resolve file="ivy.xml"/>
-		-->
+		<property name="resolver" value="local"/>
 		<ivy:info file="ivy.xml"/>
 		<echo message="revision = ${revision} ; ivy.deliver.ivy.pattern = ${ivy.deliver.ivy.pattern}"/>
-		<ivy:publish resolver="local" pubrevision="${revision}" status="release" update="true" overwrite="true">
+		<ivy:publish resolver="${resolver}" pubrevision="${revision}" status="release" update="true" overwrite="true">
 			<!--artifacts pattern="${dist.dir}/[organisation]-[module].[ext]" /-->
 			<artifacts pattern="${dist.dir}/[module].[ext]" />
 		</ivy:publish>
-		<echo message="project ${ant.project.name} released with version ${revision}"/>
+		<echo message="project ${ant.project.name} released with version ${revision} to ${resolver}"/>
 	</target>
 
 	<!-- ========= /dependencies tasks ========== -->

File ivy.xml

View file
  • Ignore whitespace
 <ivy-module version="2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
-	<!-- see: http://mvnrepository.com/ -->
 	<info organisation="org.bitbucket.tbrugz" module="sqldump"/>
 	<configurations>
 		<conf name="main"/>
 		<dependency org="log4j" name="log4j" rev="1.2.16"/>
 		<dependency org="junit" name="junit" rev="4.10"/>
 		<dependency name="kmlutils" rev="0.5.0"/>
-		<!-- TODO: add kmlutils, mondrianschema2graphml -->
+		<dependency name="mondrianschema2graphml" rev="0.5.0"/>
 		<dependency org="org.apache.derby" name="derby" rev="10.9.1.0" conf="test->default"/>
 		<dependency org="org.hsqldb" name="hsqldb" rev="2.2.8" conf="test->default"/>
 		<dependency org="com.h2database" name="h2" rev="1.3.170" conf="test->default"/>

File ivysettings.template.properties

View file
  • Ignore whitespace
-local.repository.dir=/home/tbrugz/proj/ivy-repo
+local.repository.dir=/home/tbrugz/proj/ivy-repo
+ivy.settings.dir=..
+resolver=local