Opened 4 years ago

Closed 4 years ago

#18431 closed enhancement (fixed)

Make new-style packages define their type and dependencies

Reported by: ncohen Owned by:
Priority: major Milestone: sage-6.7
Component: build Keywords:
Cc: vbraun Merged in:
Authors: Nathann Cohen, Jeroen Demeyer Reviewers: Volker Braun, Jeroen Demeyer, Nathann Cohen
Report Upstream: N/A Work issues:
Branch: f83b0c4 (Commits) Commit: f83b0c4289a6dcf1ece58172928d6a511819a725
Dependencies: Stopgaps:

Description

With this branch, it is not necssary anymore to copy/paste a package's name in four different places in order to make it standard.

This is done by adding two files in each folder:

  • 'type': can contain either 'base', 'standard', 'optional', or 'experimental'
  • 'dependencies': lists the dependencies of a package in "Make" notation.

I regret not having been able to make the 'dependencies' files clearer (they are a copy of the target dependencies form the Makefiles). Making it more human-readable is complicated, as we have to handle the "|" Make character (for order-only-prerequisite). Also, some standard packages depend on targets with are not packages themselves (i.e. prereq).

The commit are split in order to ease the review.

Nathann

Change History (19)

comment:1 Changed 4 years ago by ncohen

  • Branch set to u/ncohen/18341
  • Status changed from new to needs_review

comment:2 Changed 4 years ago by git

  • Commit set to 77f293f9b35cc889182504fbda61bef1ef0b9526

Branch pushed to git repo; I updated commit sha1. New commits:

da192bftrac #18431: match var/pkg names (CONWAY->CONWAY_POLYNOMIALS)
3ff942atrac #18431: match var/pkg names (FFLASFFPACK->FFLAS_FFPACK)
8f7dbe3trac #18431: match var/pkg names (fplll->libfplll)
e1663b5trac #18431: match var/pkg names (gd->libgd)
0928117trac #18431: match var/pkg names (rpy -> rpy2)
fbe2a87trac #18431: match var/pkg names (znpoly -> zn_poly)
4770518trac #18431: Type file for each package+define var from pkg name
3efc9fbtrac #18431: package-specific 'dependencies' files
308cefftrac #18431: Auto-generate make rules for standard packages
77f293ftrac #18431: auto-generated Make target "sage-standard-packages"

comment:3 Changed 4 years ago by aapitzsch

  • Status changed from needs_review to needs_work

In build/pkgs/conway_polynomials/dependencies

CONWAY_POLYNOMIALS depends on depends on ...

comment:4 Changed 4 years ago by git

  • Commit changed from 77f293f9b35cc889182504fbda61bef1ef0b9526 to e1148740416708c41a1d7baf9e528f6bba729de1

Branch pushed to git repo; I updated commit sha1. New commits:

e114874trac #18431: typo

comment:5 Changed 4 years ago by ncohen

  • Status changed from needs_work to needs_review

comment:6 Changed 4 years ago by vbraun

  • Reviewers set to Volker Braun

Can you replace the tabs by spaces in build/install. Apart from that, lgtm.

comment:7 Changed 4 years ago by git

  • Commit changed from e1148740416708c41a1d7baf9e528f6bba729de1 to 766798e30f05f739cf6d4e568b6e58c308ecd946

Branch pushed to git repo; I updated commit sha1. New commits:

766798etrac #18431: tab->spaces

comment:8 Changed 4 years ago by vbraun

  • Status changed from needs_review to positive_review

comment:9 Changed 4 years ago by ncohen

Thanks !

Nathann

comment:10 Changed 4 years ago by vbraun

  • Branch changed from u/ncohen/18341 to 766798e30f05f739cf6d4e568b6e58c308ecd946
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:11 Changed 4 years ago by vbraun

  • Commit 766798e30f05f739cf6d4e568b6e58c308ecd946 deleted
  • Resolution fixed deleted
  • Status changed from closed to new

PATCH is not defined in build/Makefile, so rebuilds from scratch fail

comment:12 Changed 4 years ago by jdemeyer

  • Authors changed from Nathann Cohen to Nathann Cohen, Jeroen Demeyer
  • Branch changed from 766798e30f05f739cf6d4e568b6e58c308ecd946 to u/jdemeyer/base_packages_except_configure_should_be_standard
  • Commit set to f83b0c4289a6dcf1ece58172928d6a511819a725
  • Reviewers changed from Volker Braun to Volker Braun, Jeroen Demeyer, Nathann Cohen
  • Status changed from new to needs_review

Last 10 new commits:

fbe2a87trac #18431: match var/pkg names (znpoly -> zn_poly)
4770518trac #18431: Type file for each package+define var from pkg name
3efc9fbtrac #18431: package-specific 'dependencies' files
308cefftrac #18431: Auto-generate make rules for standard packages
77f293ftrac #18431: auto-generated Make target "sage-standard-packages"
e114874trac #18431: typo
766798etrac #18431: tab->spaces
47e438dMerge tag '6.7' into t/18441/base_packages_except_configure_should_be_standard
4de8e37Various changes to build system
f83b0c4Correct variable name

comment:13 Changed 4 years ago by jdemeyer

  • Status changed from needs_review to positive_review

comment:14 follow-up: Changed 4 years ago by jdemeyer

I made this ticket the union of #18431 and #18441, both positively reviewed.

comment:15 follow-up: Changed 4 years ago by vbraun

So what am I supposed to merge? can you fix dependencies and milestones?

comment:16 in reply to: ↑ 14 ; follow-up: Changed 4 years ago by ncohen

I made this ticket the union of #18431 and #18441, both positively reviewed.

Why on earth did you di that? O_o

The two were reviewed, the two would have been merged together O_o

Last edited 4 years ago by ncohen (previous) (diff)

comment:17 in reply to: ↑ 15 Changed 4 years ago by jdemeyer

Replying to vbraun:

So what am I supposed to merge?

The branch on this ticket (which was formerly the branch of #18441 and which includes the commits of #18431).

can you fix dependencies and milestones?

Well, there is no sage-6.8 milestone but apart from that, it should be correct as-is.

Last edited 4 years ago by jdemeyer (previous) (diff)

comment:18 in reply to: ↑ 16 Changed 4 years ago by jdemeyer

Replying to ncohen:

I made this ticket the union of #18431 and #18441, both positively reviewed.

Why on earth did you di that? O_o

Well, I didn't know the release manager's opinion on forcing tickets to be merged together and I didn't want to risk rejection.

comment:19 Changed 4 years ago by vbraun

  • Branch changed from u/jdemeyer/base_packages_except_configure_should_be_standard to f83b0c4289a6dcf1ece58172928d6a511819a725
  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.