On Sat, Mar 07, 2009 at 09:06:35PM +0100, Dirk Stöcker wrote:
>> I can't repeat d). I didn't remove anything related to the "po" directory
>> from the "clean" target in r13964. For me, ant clean seems to work
>> just fine:
>
> Yes, but it did not clean, as the temporary files have different names
> now.
>
> --- build.xml (Revision 13997)
> +++ build.xml (Arbeitskopie)
> @@ -84,7 +84,7 @@
> <delete dir="${i18n.build.dir}" />
> <delete file="po/josm.pot"/>
> <delete>
> - <fileset dir="po" includes="*.po~" defaultexcludes="false"/>
> + <fileset dir="po" includes="*.po*~" defaultexcludes="false"/>
> </delete>
> </target>
Oh, my bad. I didn't list the directory, but relied on "svn status",
which didn't list the temporary files due to the built-in svn:ignore rules.
>> Given issues a) and b), I will revert i18n/build.xml to use the exec
>> tasks as before r13964. I'll try to add sorting the file names to the
>> mix, so that the number of merge conflicts will be reduced in the future.
>
> I can live with b for some time, but not without a. But generally I think
> this should be fixed in gettext-ant-tasks directly.
>
> Will they do this? Generally I like the ant-task based variant more than
> the old method, but it must work, that's clear.
Yes, the ant-task would be the "ant way of doing things". I will file
issues against gettext-ant-tasks and hope the best. It looks like the
developers are not keen to accept complex patches. The patch that I sent to
http://code.google.com/p/gettext-commons/issues/detail?id=9
was rewritten.
Marko
_______________________________________________
josm-dev mailing list
josm-dev@openstreetmap.org
http://lists.openstreetmap.org/listinfo/josm-dev
