I've attached a few more patches:
* #1, #2 are repeats that appear to have slipped through the cracks
* #3 adds support for deriving the project version from the git
revision (in case the svn repository is ever converted to git, and for
those like myself who like to work in git)
* #4 updates the .gitignore file.
I don't see an ant target for the extras, only an entry in mkgmap.iml.
Do you want to add a special ant target for these? Or simply always
include them in the main build?
Thats right there isn't, I don't know if anyone uses the code or even
if it still works. So I don't see this as something that needs to be
addressed before we move over to the new system.
I agree; maybe we can create a new branch after build is reintegrated
into trunk.
Thats fine about the targets, but there are really only two situations
in my mind: (1) build the standard distribution and (2) get
everything needed for development, so that nothing shows up as red in
an IDE and you can check that nothing is broken including things that
are not distributed.
You can run 'ant resolve' to get all dependencies. Is that sufficient?
(The term "resolve" is not my favorite, but it's what osmosis uses so
I kept it.)
Lets ignore optional stuff at the moment.
Agreed.
-Richard
>From 222082822dd1cbf4b53c7cb2eabd8550a76e9f15 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Sun, 29 Jan 2012 15:53:32 -0500
Subject: [PATCH 1/4] fix mkgmap ivy organisation
---
ivy.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ivy.xml b/ivy.xml
index ddec2e9..0e3c252 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -1,5 +1,5 @@
<ivy-module version="2.0">
- <info organisation="uk.me.parabola" module="mkgmap"/>
+ <info organisation="uk.org.mkgmap" module="mkgmap"/>
<configurations>
<conf name="default" visibility="public" description="runtime dependencies and master artifact can be used with this conf" extends="runtime,master"/>
<conf name="master" visibility="public" description="contains only the artifact published by this module itself, with no transitive dependencies"/>
--
1.7.8.3
>From 4f3244c6bb81134cf63b102b4c795e3e9adf2cd5 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Sat, 4 Feb 2012 14:39:19 -0500
Subject: [PATCH 2/4] rename *.classpath to ivy.classpath.*
This should make it easier for the reader to understand that the
contents of these properties are the dependencies downloaded by ivy.
---
build.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/build.xml b/build.xml
index 1c14eb4..f91d240 100644
--- a/build.xml
+++ b/build.xml
@@ -88,25 +88,25 @@
<property name="ivy.distrib.dir" value="ivy-distrib" />
<!-- For class paths -->
- <path id="compile.classpath">
+ <path id="ivy.classpath.compile">
<fileset dir="${ivy.lib.dir}/compile" />
</path>
- <path id="test.classpath">
+ <path id="ivy.classpath.test">
<fileset dir="${ivy.lib.dir}/test" />
</path>
- <path id="macker.classpath">
+ <path id="ivy.classpath.macker">
<fileset dir="${ivy.lib.dir}/macker" />
</path>
<path id="main">
<pathelement location="${build.classes}" />
- <path refid="compile.classpath" />
+ <path refid="ivy.classpath.compile" />
</path>
<path id="test">
<pathelement location="test/resources"/>
<pathelement location="build/test"/>
- <path refid="test.classpath" />
+ <path refid="ivy.classpath.test" />
<pathelement location="${build.classes}" />
<pathelement location="test"/>
</path>
@@ -268,7 +268,7 @@
<mkdir dir="${dist}/doc/api"/>
<copy todir="${dist}/lib" flatten="true">
- <path refid="compile.classpath" />
+ <path refid="ivy.classpath.compile" />
</copy>
<manifestclasspath property="manifest_cp" jarfile="${project.jar}">
@@ -334,7 +334,7 @@
<target name="macker" depends="build, resolve-macker">
<taskdef name="macker"
classname="net.innig.macker.ant.MackerAntTask"
- classpathref="macker.classpath"/>
+ classpathref="ivy.classpath.macker"/>
<property name="macker.report.xml" value="macker.out.xml"/>
<property name="macker.report.html" value="macker.out.html"/>
@@ -348,7 +348,7 @@
<taskdef name="macker-report"
classname="net.innig.macker.ant.MackerReportAntTask"
- classpathref="macker.classpath"/>
+ classpathref="ivy.classpath.macker"/>
<macker-report xmlReportfile="${macker.report.xml}" outputFile="${macker.report.html}" />
</target>
--
1.7.8.3
>From f475ac188d8320bc3d01a3335f6cafd5eadac4c0 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Sat, 4 Feb 2012 18:08:39 -0500
Subject: [PATCH 3/4] get revision from git if svn revision unavailable
---
build.xml | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/build.xml b/build.xml
index f91d240..6f6133b 100644
--- a/build.xml
+++ b/build.xml
@@ -78,6 +78,18 @@
<not><equals arg1="${svn.version}" arg2="" /></not>
</and>
</condition>
+ <exec executable="git" dir="${top}" logError="true"
+ outputproperty="git.version" resultproperty="gitdescribe.result"
+ failifexecutionfails="false">
+ <arg value="describe" /><arg value="--dirty" /><arg value="--tags" /><arg value="--always" />
+ </exec>
+ <condition property="project.version" value="${git.version}">
+ <and>
+ <isset property="git.version" />
+ <equals arg1="${gitdescribe.result}" arg2="0" />
+ <not><equals arg1="${git.version}" arg2="" /></not>
+ </and>
+ </condition>
<property name="project.version" value="${project.version.default}" />
<!-- ivy dependency support -->
--
1.7.8.3
>From 6d99e4831deb5758794cdf025cbc9406f6480796 Mon Sep 17 00:00:00 2001
From: Richard Hansen <[email protected]>
Date: Sun, 5 Feb 2012 16:15:18 -0500
Subject: [PATCH 4/4] update .gitignore
---
.gitignore | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index fc09a7c..f0a3178 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,6 @@
bin
build/classes
dist
+ivy-distrib/
+lib/
mkgmap.log.*
--
1.7.8.3
_______________________________________________
mkgmap-dev mailing list
[email protected]
http://www.mkgmap.org.uk/mailman/listinfo/mkgmap-dev
