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
On 2018-05-23 at 22:31 +0200 Marián Kyral wrote:
Hi,
sorry for the late reply.
Dne 17.5.2018 v 22:03 Holger Mappt napsal(a):
Hi Marián,
Looks like you managed to publish the PointInfo plugin in the meantime
(r34195).
Yes, I did it manually by committing the binary with proper commit message.
An SVN status with ! is never good. I assume there was a newer version
in the repo that was not fetched because you had a modified
dist/pointInfo.jar. Run svn status with option -u (to see what updates
are in the repository), delete your modified pointInfo.jar, svn update
dist, publish.
And this is strange. I deleted the binary and restored them from repo.
Then I run "ant publish", it deleted binary in "dist" folder, compile
it, created the "*-source.jar" and "*-javadoc.jar" files and svn commit
fails on messages I've sent.
*Just tested now ant the result is the same. Folders are clean*
[22:06:24 marian@worker pointInfo (master)]$ svn status -u
Status against revision: 34216
[22:10:39 marian@worker pointInfo (master)]$ svn status -u ../../dist
Status against revision: 34216
*But:*
[22:10:55 marian@worker pointInfo (master)]$ ant publish
Picked up _JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on
-Dswing.aatext=true
Buildfile:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/build.xml
ensure-svn-present:
core-info:
[echo] Building against core revision 13823.
[echo] Plugin-Mainversion is set to 12666.
[delete] Deleting:
/home/marian/projekty/josm/josm_plugins/plugins/pointInfo/core.info.xml
commit-current:
[echo] Commiting the plugin source with message 'PointInfo: Adds a
link to photo metadata in Catastro module. Patch by Javier Sánchez
Portero.' ...
update-current:
[echo] Updating plugin source ...
[echo] Updating
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
[exec] Result: 1
[...]
commit-dist:
[echo]
[echo] ***** Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *****
[echo] Commit message : 'PointInfo: Adds a link to photo
metadata in Catastro module. Patch by Javier Sánchez Portero.'
[echo] Plugin-Mainversion: 12666
[echo] JOSM build version: 13823
[echo] Plugin-Version : 34216
[echo] ***** / Properties of published
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar *****
[echo]
[echo] Now commiting
/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar ...
[echo]
[exec] Result: 1
publish:
BUILD SUCCESSFUL
Total time: 11 seconds
*The svn.log*
[22:15:06 marian@worker pointInfo (master)]$ cat svn.log
[...]
Updating '.':
At revision 34216.
Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo.jar'svn:
E155007: None of the targets are working copies
Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-javadoc.jar'
Skipped
'../dist/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar'
svn: E200009: Commit failed (details follow):
svn: E200009:
'/home/marian/projekty/josm/josm_plugins/dist/pointInfo-sources.jar' is
not under version control
*And current status:*
[22:15:10 marian@worker pointInfo (master)]$ svn status -u
? svn.log
Status against revision: 34216
[22:23:10 marian@worker pointInfo (master)]$ svn status -u ../../dist
M 34216 ../../dist/pointInfo.jar
Status against revision: 34216
[22:23:15 marian@worker pointInfo (master)]$
Maybe, could you try?
Thanks,
Marián
Regards,
Holger
On 2018-05-17 at 12:42 +0200 Marián Kyral wrote:
Hi,
It is a long time ago when I published last version of pointInfo plugin.
Now I want to publish updated version, but it does not work :-(
I've commited changes in code:
------------------------------------------------------------------------
r34168 | mkyral | 2018-04-24 07:48:05 +0200 (Út, 24 dub 2018) | 5 lines
PointInfo: Add Spanish Cadastre Web Services module.
Patch by Javier Sánchez Portero.
Then I want to publish updated binary:
------------------------------------------------------------------------
$ cd /home/marian/projekty/josm/josm_plugins/dist/
$ svn status
! pointInfo.jar
$ svn update
Updating '.':
Restored 'pointInfo.jar'
At revision 34194.
