No trunk branch for GitHub plugins

[Don-vip]

I see more and more plugins using a "trunk" git branch on GitHub. This is not correct. GitHub bridge maps "trunk" ​to the Git HEAD branch, which is usually master, and it seems it chokes if the branch is also called trunk, causing many svn errors during update or commit (right now I can't commit on pt_assistant because of this):

Commit failed (details follow):
Unexpected server error 500 'Internal Server Error' on
 '/JOSM/pt_assistant/!svn/wrk/7dffa700-c16c-324f-a02f-f3f064ba81a2/branches/trunk/.classpath'

Can you please rename the few "trunk" branches to master so we get back a clean situation?

[Don-vip]

Also, where are the lang files? When I build pt_assistant plugin, the jar contains no translations at all.

[floscher]

For the Mapillary plugin I use trunk for the state that is in the SVN, which JOSM maintainers can modify. master is used as the stable and always successfully building branch. I would like to keep those two branches there. And I can't unprotect the master branch anyway since my admin rights to the Mapillary repository were revoked a while ago.

I will rename the trunk branch for the Mapillary plugin to dev, but otherwise leave it as is.

For the pt_assistant plugin this is a left-over from the migration to git. I wanted to switch the name to master anyway, once GSoC is over. I'll change the name soon.

[floscher]

Regarding the *.lang files: If you have gettext installed, they are generated. If it's not installed, they are not included in the *.jar file.

The translations are in the *.po files, so there are not so many binary files in the repo.

[Don-vip]

Replying to floscher:

For the Mapillary plugin I use trunk for the state that is in the SVN, which JOSM maintainers can modify. master is used as the stable and always successfully building branch.

I don't see the need for distinction (it sounds just like extra work), but OK. Just a reminder: the branch used by JOSM SVN must always compile too.

And I can't unprotect the master branch anyway since my admin rights to the Mapillary repository were revoked a while ago.

Maybe an unwanted side effect of my last privileges cleanup. I've added you admin again.

I will rename the trunk branch for the Mapillary plugin to dev, but otherwise leave it as is.

For the pt_assistant plugin this is a left-over from the migration to git. I wanted to switch the name to master anyway, once GSoC is over. I'll change the name soon.

Thanks!

[Don-vip]

Replying to floscher:

Regarding the *.lang files: If you have gettext installed, they are generated. If it's not installed, they are not included in the *.jar file.

Even with ant?

[Don-vip]

This is also why Jenkins doesn't update Mapillary and pt_assistant plugins unless I manually force the update. Last update was done by me on 13th of August:

Working Copy Root Path: /var/lib/jenkins/jobs/JOSM-Plugins/workspace/jdk/JDK8/pt_assistant
URL: https://github.com/JOSM/pt_assistant/branches/trunk
Relative URL: ^/branches/trunk
Repository Root: https://github.com/JOSM/pt_assistant
Repository UUID: 62ad92a2-b1da-500c-55a2-ce57b7db7bff
Revision: 383
Node Kind: directory
Schedule: normal
Last Changed Author: biswesh456
Last Changed Rev: 347
Last Changed Date: 2018-08-13 20:44:57 +0200 (Mon, 13 Aug 2018)

[floscher]

Replying to Don-vip:

Replying to floscher:

Regarding the *.lang files: If you have gettext installed, they are generated. If it's not installed, they are not included in the *.jar file.

Even with ant?

No, at the moment only with Gradle. I didn't implement an ant target, because I thought the translations were not relevant for Jenkins. See also ​an earlier discussion on why Ant and Gradle create slightly different *.jar files.

Is there a need for an ant target that produces *.lang files?

[Don-vip]

As long as at least a Gradle user maintains those plugins, no. But there's a risk we publish a plugin without translations.

[floscher]

I updated the SVN externals to point to a different branch. For the Mapillary and wikipedia plugin the master branch was already used. For the pt_assistant plugin I changed it from trunk to master.

[Don-vip]

This is not enough I think. Right now the svn update fails:

URL 'https://github.com/JOSM/pt_assistant/trunk' at revision 460 doesn't exist

[Don-vip]

I am pretty sure the "trunk" branch must be deleted. Only the repositories with these branches are problematic.