After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 782782 - Merge valadoc source into vala 0.37.x
Merge valadoc source into vala 0.37.x
Status: RESOLVED FIXED
Product: vala
Classification: Core
Component: Documentation
0.37.x
Other Linux
: Normal normal
: ---
Assigned To: Vala maintainers
Vala maintainers
Depends on:
Blocks:
 
 
Reported: 2017-05-18 10:53 UTC by Rico Tzschichholz
Modified: 2017-09-27 15:11 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Migrates valadoc to vala (985 bytes, application/x-shellscript)
2017-06-25 14:54 UTC, Florian Brosch
Details

Description Rico Tzschichholz 2017-05-18 10:53:29 UTC
I am in favour of merging the valadoc source into vala itself to reduce maintenance work. So while valadoc can be considered a part of the vala-toolchain and is better to have it live in a combined repository.

While valadoc never had an official release before its 0.36.0, the availability in distributions is/was quite low.
Comment 1 Rico Tzschichholz 2017-06-04 10:32:12 UTC
https://git.gnome.org/browse/vala/log/?h=wip/merge-valadoc
Comment 2 Florian Brosch 2017-06-05 16:20:27 UTC
I have mixed feelings about merging both repositories. However, I am okay with it as long as you keep my commit-history.
Comment 3 Rico Tzschichholz 2017-06-06 11:23:50 UTC
@flo: I see, so please describe a way for how to accomplish that.
Comment 4 Florian Brosch 2017-06-25 14:54:47 UTC
Created attachment 354418 [details]
Migrates valadoc to vala

Hey Rico,

I prepared a branch but had no time to pick-up my private key from home. Here is a script that re-creates all steps.
Comment 5 Rico Tzschichholz 2017-06-27 11:27:30 UTC
@flo: Pushed a new branch which includes the git history
https://git.gnome.org/browse/vala/log/?h=wip/valadoc
Comment 6 Rico Tzschichholz 2017-06-28 12:18:43 UTC
commit 2b742fce82eb1326faaee3b2cc4ff993e701ef53
Merge: 7609126be 93d9fe647
Author: Rico Tzschichholz <ricotz@ubuntu.com>
Date:   Tue Jun 27 13:09:30 2017 +0200

    Merge valadoc 0.36.0
    
    Consider valadoc a part of vala's toolchain and therefore let it live in
    the main repository.
    
    With this merge there is no need to maintain multiple driver sources since
    only one is required from now on.
    
    There is no dependency on gee-0.8 and vala's internal gee copy has made to
    be sufficient.
    
    The libvaladoc library will be suffixed with vala's version suffix too.
    Besides this renaming the rest of the valadoc file layout is kept the same.
Comment 7 Armin K. 2017-09-08 13:15:27 UTC
This makes vala depend on graphviz now. Can valadoc building at least be made optional? Thanks.
Comment 8 Al Thomas 2017-09-08 13:31:46 UTC
(In reply to Armin K. from comment #7)
> This makes vala depend on graphviz now. Can valadoc building at least be
> made optional? Thanks.

See https://bugzilla.gnome.org/show_bug.cgi?id=787375
Comment 9 Philip Withnall 2017-09-27 11:57:52 UTC
Should something be done with the valadoc.git repository to make it more obvious that valadoc now lives in Vala? For example, put an obvious notice in README, or empty the repository and leave *only* the README file.
Comment 10 Al Thomas 2017-09-27 12:03:45 UTC
(In reply to Philip Withnall from comment #9)
> Should something be done with the valadoc.git repository to make it more
> obvious that valadoc now lives in Vala? For example, put an obvious notice
> in README, or empty the repository and leave *only* the README file.

Good idea. I think the README should be updated and the repository archived: https://git.gnome.org/browse/archive/
Comment 11 Rico Tzschichholz 2017-09-27 12:13:41 UTC
The original repository is still required to vala < 0.38.
Currently I still intend to support 0.34 and 0.36 branches of vala.
Comment 12 Philip Withnall 2017-09-27 12:24:38 UTC
(In reply to Rico Tzschichholz from comment #11)
> The original repository is still required to vala < 0.38.
> Currently I still intend to support 0.34 and 0.36 branches of vala.

Right, but its README file could still be changed to mention that development has moved to vala.git, right?
Comment 13 Rico Tzschichholz 2017-09-27 15:11:25 UTC
@philip: Yes, but I guess I will cherry pick some already made fixes.