Add trinity-admin-prepare, trinity-gen-configure and trinity-econf functions #165

Merged
SlavekB merged 1 commits from feat/econf-gen-func into master 4 years ago
Collaborator

Signed-off-by: ormorph roma251078@mail.ru

These functions are required to build packages using the admin module and the configure script. These features are planned to be used in packages such as tdewebdev, which do not use the cmake utility for assembly.
It is also planned to use these functions in combination with eclass trinity-meta-2, with the addition of the following lines to the ebuild file:

TSM_EXTRACT_LIST="configure.in.in Makefile.am.in \
                ChangeLog AUTHORS NEWS README "
Signed-off-by: ormorph <roma251078@mail.ru> These functions are required to build packages using the `admin` module and the `configure` script. These features are planned to be used in packages such as tdewebdev, which do not use the cmake utility for assembly. It is also planned to use these functions in combination with eclass `trinity-meta-2`, with the addition of the following lines to the ebuild file: ``` TSM_EXTRACT_LIST="configure.in.in Makefile.am.in \ ChangeLog AUTHORS NEWS README " ```
ormorph added the PR/rfc label 4 years ago
ormorph changed title from WIP: Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` to Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` 4 years ago
Chris commented 4 years ago
Collaborator

Great, @ormorph! 👍

Original I had the idea to introduce some TRINITY_BS in the ebuilds and just add some ifs and elses in the ebuilds code, where the default value would be CMAKE. But I think this way it will work too.

At the moment working on TDE for me is really hard, because I rarely can access TGW, because of DNS problems.

Great, @ormorph! :+1: Original I had the idea to introduce some `TRINITY_BS` in the ebuilds and just add some ifs and elses in the ebuilds code, where the default value would be `CMAKE`. But I think this way it will work too. At the moment working on TDE for me is really hard, because I rarely can access TGW, because of DNS problems.
Chris commented 4 years ago
Collaborator

Maybe your idea is the better one, because I expect that in next time tdewebdev and tdeaccessibility will be ported to CMake. At least it is already in work.

About the to be extracted files - Maybe it would make sense to integrate them in the eclasses directly (like it is done for the CMakeLists)? Let me know, if it can be merged.

Maybe your idea is the better one, because I expect that in next time `tdewebdev` and `tdeaccessibility` will be ported to CMake. At least it is already in work. About the to be extracted files - Maybe it would make sense to integrate them in the eclasses directly (like it is done for the CMakeLists)? Let me know, if it can be merged.
Chris added this to the R14.0.9 release milestone 4 years ago
Chris commented 4 years ago
Collaborator

Today the || die safeguards for Portage built in commands like emake with modern EAPIs aren't needed anymore.

Today the `|| die` safeguards for Portage built in commands like `emake` with modern EAPIs aren't needed anymore.
Poster
Collaborator

About the to be extracted files - Maybe it would make sense to integrate them in the eclasses directly (like it is done for the CMakeLists)? Let me know, if it can be merged.

For example, create a function:

need-admin() {
	TSM_EXTRACT_LIST+="configure.in.in Makefile.am.in \
       	         ChangeLog AUTHORS NEWS README "
}

Next, call the function in the ebuild:

need-admin

need-trinity

The next way is to add a variable to trinity-base-2:

ADMIN_EXTRACT_LIST="configure.in.in Makefile.am.in \
       	        ChangeLog AUTHORS NEWS README "

then add to ebild:

TSM_EXTRACT_LIST="${ANMIN_EXTRACT_LIST}"

Today the || die safeguards for Portage built in commands like emake with modern EAPIs aren't needed anymore.

Ok I understood.

> About the to be extracted files - Maybe it would make sense to integrate them in the eclasses directly (like it is done for the CMakeLists)? Let me know, if it can be merged. For example, create a function: ``` need-admin() { TSM_EXTRACT_LIST+="configure.in.in Makefile.am.in \ ChangeLog AUTHORS NEWS README " } ``` Next, call the function in the ebuild: ``` need-admin need-trinity ``` The next way is to add a variable to `trinity-base-2`: ``` ADMIN_EXTRACT_LIST="configure.in.in Makefile.am.in \ ChangeLog AUTHORS NEWS README " ``` then add to ebild: ``` TSM_EXTRACT_LIST="${ANMIN_EXTRACT_LIST}" ``` > Today the || die safeguards for Portage built in commands like emake with modern EAPIs aren't needed anymore. Ok I understood.
Poster
Collaborator

I don’t think it’s worth combining this with existing code in eclass, as there is a gradual transition to cmake. Otherwise, there may be more problems associated with the removal of already non-working code from eclass. I think complicating the code will be superfluous. Therefore, I decided to add only those functions that can be called in the ebuild file, which can be combined with the already created functionality.

I don’t think it’s worth combining this with existing code in eclass, as there is a gradual transition to cmake. Otherwise, there may be more problems associated with the removal of already non-working code from eclass. I think complicating the code will be superfluous. Therefore, I decided to add only those functions that can be called in the ebuild file, which can be combined with the already created functionality.
Poster
Collaborator

I decided to create a test branch trinity-nomodule, for downloading from alternative sources. I integrated these functions into eclass, achieved compatibility with the assembly using the admin module. Compatibility is provided by the check_admin function. The ADMIN_LIST variable in the inside of the function is responsible for this. Added tdewebdev-meta packages. I tested the working ability on version 14.0.8.

I decided to create a test branch `trinity-nomodule`, for downloading from alternative sources. I integrated these functions into eclass, achieved compatibility with the assembly using the `admin` module. Compatibility is provided by the `check_admin` function. The `ADMIN_LIST` variable in the inside of the function is responsible for this. Added `tdewebdev-meta` packages. I tested the working ability on version 14.0.8.
ormorph removed the PR/rfc label 4 years ago
ormorph changed title from Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` to WIP:Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` 4 years ago
SlavekB modified the milestone from R14.0.9 release to R14.0.10 release 4 years ago
Owner

I did a rebase on the current HEAD. There was no need to resolve any significant conflicts.

Are there any reasons why PR is labeled as WIP? Or is it possible to move forward and merge it?

I did a rebase on the current HEAD. There was no need to resolve any significant conflicts. Are there any reasons why PR is labeled as WIP? Or is it possible to move forward and merge it?
Poster
Collaborator

In principle, you can merge. I will make corrections and additions in the new PR later.
You can also merge #162.

In principle, you can merge. I will make corrections and additions in the new PR later. You can also merge [#162](https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging-gentoo/pulls/162).
Collaborator

This one's a bit beyond my ability to evaluate for functionality, but it doesn't seem likely to break anything. I'm okay with merging it.

This one's a bit beyond my ability to evaluate for functionality, but it doesn't seem likely to break anything. I'm okay with merging it.
SlavekB changed title from WIP:Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` to Add `trinity-admin-prepare, trinity-gen-configure and trinity-econf functions` 4 years ago
SlavekB merged commit d531cb5908 into master 4 years ago
SlavekB deleted branch feat/econf-gen-func 4 years ago
The pull request has been merged as d531cb5908.
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
4 Participants
Notifications
Due Date

No due date set.

Dependencies

No dependencies set.

Reference: TDE/tde-packaging-gentoo#165
Loading…
There is no content yet.