Hi Vincent,
I don't see how that can be done without conflicts. If the sources and
javadoc JARs are generated but not svn added and svn committed then
those JARs are SVN private files. Everyone who runs the according target
will have those private files in her/his working copy dist directory. If
someone svn adds and svn commits the JARs then the next svn update will
show merge conflicts because the JARs are now in the repository and the
working copy as private files and SVN doesn't know what to do.
A clean solution is to either add the sources and javadoc JARs to all
targets and to create+commit them for all plugins in dist, or not to do
that. The sources and javadoc JARs that were added in r34045 were
deleted in the next revision, so my assumption is that we don't want
those JARs in dist.
So what's the plan with sources and javadoc JARs?
Regards,
Holger
On 2018-05-30 at 01:36 +0200 Vincent Privat wrote:
Ah sorry I totally misunderstood your change. Please restore what I did,
I thought you would only modify the "publish" target to ignore the files
when committing to SVN, not delete the targets!
2018-05-29 22:03 GMT+02:00 Holger Mappt <holger...@gmx.net
<mailto:holger...@gmx.net>>:
Hi,
I implemented the two changes in r34224 and r34225. This undid most
of the changes to build-common.xml from r34045 where
plugin-sources.jar and plugin-javadoc.jar were added.
Marián, it should work for you now.
Regards,
Holger
On 2018-05-27 at 12:18 +0200 Vincent Privat wrote:
No objections:)
Le sam. 26 mai 2018 à 22:54, Holger Mappt
<holgerosm-hi6y0cq0...@public.gmane.org
<mailto:holgerosm-hi6y0cq0...@public.gmane.org>> a écrit :
Hi Marián,
There are two problems and I can confirm your issue.
Problem one is "ant update-current" which expands
../dist/${plugin.jar}
to
../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar
instead of ../dist/pointInfo.jar. The ../dist/ must be
removed in the
target, the path to dist is part of ${plugin.jar} already.
Problem two is that "ant commit-dist" tries to commit
pointInfo-javadoc.jar and pointInfo-sources.jar. I think
they should not
be committed. They are in the ignore list (svn pl -v
../../dist) and I
don't see that other plugins have them in dist. SVN fails to
commit the
two files because they are not "svn add"ed.
I assume you are the only one who uses the publish target.
Otherwise all
others would see the same problem.
Who else uses "ant publish"? If there are no objections I
will make
these two changes to build-common.xml:
* Remove ../dist/ from update-current
* Do not update/publish/commit plugin.sources.jar and
plugin.javadoc.jar
Regards,
Holger
