[Qgis-community-team] Transifex and doc 1.8

Richard Duivenvoorde richard at duif.net
Mon Apr 1 12:27:12 PDT 2013


On 01-04-13 11:39, Nathan Woodrow wrote:
> Richard,
>
> If you are talking about having a different github repo for each release
> that would be really ugly and I'm not to keen of that idea.  git has the
> branching and tagging stuff for a reason and there isn't reason that we
> can't use it here for this. This would also make tracking version
> changes really hard.
>
> My suggestion is to have a branch for each release with a tag at each
> minor release on that branch, master is always kept up to date with what
> is in dev, and a branch is made at release time.
>
> We can provide shell scripts for people to clone the repo and checkout
> the most current release to work on.  So in the upcoming 2.0 case we
> could have a script that clones the repo and sets the branch to master,
> people can work on that until we release 2.0 at which point someone
> creates a 2.0 branch a "Switch to 2.0" shell/batch script.
>
> Deploying to the webserver is easy git archive --format zip --output
> /full/path/to/zipfile.zip 2.0 and just unpack it on the webserver.  This
> would be much easier then having different repos to clone and export from.
>
> git is just part of our workflow now and IMO should be used for this.
>   The main thing is just abstracting away a lot of the git mess into
> simple to run scripts.

Hi Nathan,

no I'm not talking about a different repo, but  a copy of a directory in 
the same (documentation) repo in master (after a release).

So now we have:
https://github.com/qgis/QGIS-Documentation/tree/master/source/docs

and I my idea was to have IN the user_manual directory, a version of the 
user_manual for every version

source/docs/user_manual/master (dev version)
source/docs/user_manual/1.8
source/docs/user_manual/2.0 (a copy dev version after 2.0 release) etc
source/docs/qgis_governance is ok (no need for a new version)
but
source/docs/pyqgis_developer_cookbook/master
source/docs/pyqgis_developer_cookbook/1.8
source/docs/pyqgis_developer_cookbook/2.0
etc

I know it is redundancy, and from a coder/github point of view this 
should be done via branching and or tagging, but for a non-coder pov I 
think it is more clear and 'transparant'.

But (even more important) we could just put the full source directory 
into Transifex, no need to think about which version is to be put in 
there etc etc..
Making it easier to just fix an error in whatever translation you find 
important.

For the git-users it is still possible to use github (only without 
branches, allways working in 'master')

Regards,

Richard Duivenvoorde






More information about the Qgis-community-team mailing list