[mkgmap-dev] [PATCH] Use Apache Ivy to fetch dependencies, put them in dist

Mon Jan 23 08:21:22 GMT 2012

Hi Richard,

I have no idea why, but tortoisesvn still wasn't happy with that patch. 
Anyway, I tried the build branch and the only thing to do was the manual copying of the pbf jars. 

Nice!

Gerd

Date: Sun, 22 Jan 2012 14:34:11 -0500
From: rhansen at bbn.com
To: mkgmap-dev at lists.mkgmap.org.uk
Subject: Re: [mkgmap-dev] [PATCH] Use Apache Ivy to fetch dependencies, put them in dist

On 2012-01-22 03:23, GerdP wrote:
> Hi Richard,
>
> I have problems to apply the patch on r2179 using tortoiseSVN on windows.
> What tool do you suggest to do that?

Apologies -- I prefer Git for development so that's what I used to 
generate the patch.  Subversion must not have liked the osmpbf.jar 
(binary file) section.  Attached is the same patch but generated by svn, 
so tortoiseSVN should be able to apply it.

Because svn doesn't support binary diffs, you'll have to manually 
download osmpbf.jar from 
<https://github.com/openstreetmap/osmosis/raw/master/build-support/repo/crosby/osmpbf/1.1.1-754a33af/jars/osmpbf.jar> 
and put it in build-support/repo/crosby/osmpbf/1.1.1-754a33af/jars. 
Subversion also doesn't support embedding the commit message in patches, 
so here's the commit message I used in case someone want to reuse some 
of it:

-------------------------------------------------------------------
Use Apache Ivy to fetch dependencies, put them in dist

Much of the code was borrowed from osmosis.

Notes:
  * pbf support is no longer conditionally compiled -- it is always
    enabled
  * osmpbf has not yet been published to the public Maven Central
    Repository, so a copy of it is included locally
  * junit is only fetched if the 'test' target is run
  * macker and its dependencies are only fetched if the 'macker' target
    is run
  * The Ivy publish task needs the project version, so build.xml now
    sets a property called 'project.version'.  The value is currently
    hard-coded to "svn"; this should probably be replaced with a
    programmatic method for determining the current svn version.
  * build.xml now creates the version.properties file with svn.version
    set to the value of the project.version property.  This ensures
    that the version used by the Ivy publish task matches the version
    reported by the '--version' argument.
  * build.xml now sets the Implementation-Version property in the
    manifest file to the value of the project.version property
  * the organization setting in the ivy.xml file is set to
    "uk.me.parabola"; maybe this should be "uk.org.mkgmap"

_______________________________________________
mkgmap-dev mailing list
mkgmap-dev at lists.mkgmap.org.uk
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.mkgmap.org.uk/pipermail/mkgmap-dev/attachments/20120123/5667b849/attachment.html 