New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
License Templates #749
License Templates #749
Conversation
Added LGPLv3 license
Rename gpl to gpl2 to explicitly indicate the license version
Added LGPLv2 license (GNU Lesser General Public License Version 2)
Added cc0 (CC0 1.0 Universal (CC0 1.0))
Added MPLv2 (Mozilla Public License v2.0)
Added AGPLv3 (GNU Affero General Public License v3)
Added AGPLv2 (GNU Affero General Public License v2)
Added GPLv3 (GNU General Public License v3)
Added BSD 2-Clause License
Renamed ./data/templates/bsd to ./data/templates/bsd-3-clause (BSD 3-Clause License) Updated ./data/templates/bsd-3-clause (BSD 3-Clause License)
Fixed formatting
Added the zib/libpng License
Added Apache License v2.0
Added the MIT License (MIT)
Nice try to sneak #305 in again, but ... :)
|
@elextr , you remembered me (^u^). Why do these break the build? Why is it that the "gpl" and "bsd" license in the mainstream Geany release not break the build? What code could I (or someone else) add or fix to make this work? These additional templates (like the "gpl" and "bsd" licenses) can be inserted in a block-comment of the code the developer has open. For instance, in C, I could uses C's multi-line comments and then insert a license template between the opening and closing comment-syntax. Thus, these license templates are "universal", just like the "gpl" and "bsd" licenses in the "Edit > Insert Comments" sub-menu. |
I explained this license feature in more detail on the ML. However, I would love to help fix this "broken build" issue. |
@DevynCJohnson at the bottom of pull requests it shows whether it would break the build system on the build server. There's a "Details" link that shows the results. In this case, the relevant error is around here: https://travis-ci.org/geany/geany/jobs/90350084#L1041 Probably the new files weren't added to the relevant Makefile.am file properly. |
For maximum likelihood of getting this PR merged quickly, your best bet is to reproduce the kind of changes in this Gist for the current Geany master branch and with your additional licenses. (Note: I manually edited the Gist patch, compared to the version I linked on the mailing list, to remove all the noise in the GUI XML builder file). Of course it would be better to make the licenses more easily user-extensible, but unless you want to re-do the related code in Geany, just hard-coding more licenses would probably be accepted. |
Regarding:
I think it's because you renamed the files but did not update the build system to reflect the new names. |
@DevynCJohnson the big red message below "all checks have failed" is a giveaway :) As @codebrainz said, just adding the template to the directory won't do anything, the associated menu items need to be created. The template area of Geany has grown rather than being designed, so maybe its confusing. Let me summarise. There are two sorts of templates, those that paste into comments using The comment templates include a couple of licenses and are "hard coded" because they need menu entries to be added inside The file templates are used to create new files and show in the So it doesn't make adding new licenses easy the way it works at the moment. Which is why the list is so limited. The best solution is to make the |
@codebrainz , thanks! I was not aware that I had to add license templates to Makefile.am. I will try that. |
I added the code needed for the license templates that I proposed.
Added the code needed for the proposed license templates.
Added the code needed for the proposed license templates.
Added the proposed licenses to "templates=".
I will make a new pull-request that has the new modifications. |
New PR #752 |
[ci skip]
The functions "editor_insert_snippet" and "editor_find_snippet" in ./src/editor.c dynamically find and add license templates to the "Edit > Insert Comments" sub-menu during compilation.