Opened 7 years ago

Closed 7 years ago

Last modified 7 years ago

#14781 closed task (fixed)

untracked files in spkgs should all be under src

Reported by: ohanar Owned by: jdemeyer
Priority: major Milestone: sage-5.12
Component: packages: standard Keywords:
Cc: jdemeyer Merged in:
Authors: Reviewers: R. Andrew Ohana
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: #14892, #14754, #14869, #14692, #14737, Stopgaps:

Description

This is a requirement for making minimal changes to the build system for the git transition. The alternatives all would require expanding the functionality of the git build system, further differentiating it from the current one.

The standard spkgs that currently violate this assumption:

  1. atlas-3.10.x (autotools output and lapack tarball)
  2. mpfr (upstream patches)
  3. singular (shared directory)
  4. ntl (custom libtool)
  5. cliquer (some of the patch files)

The proposed solution is to track all patches, and for directories/tarballs, move src to src/pkgname down one layer and move the extra directories/tarballs to be under src.

Change History (19)

comment:1 Changed 7 years ago by leif

OMG...

comment:2 follow-up: Changed 7 years ago by jdemeyer

Doesn't git support untracked files? :-)

comment:3 in reply to: ↑ 2 Changed 7 years ago by ohanar

Replying to jdemeyer:

Doesn't git support untracked files? :-)

Sure and you are welcome to work on extending the build system to handle all these inconsistent untracked files that are hidden behind the archiving process in the current structure (but which is gone in the unified git repository). I just have no interest in continuing to extend the (IMO) very hackish current build system in such ways when it can easily be resolved using a simpler hack.

Last edited 7 years ago by ohanar (previous) (diff)

comment:4 Changed 7 years ago by vbraun

So just to be clear, the proposed solution is to

  1. move all non-patch files into src/
  2. tar the resulting src directory up as our "source tarball"
  3. postpone any further work on the build system until after the git transition

That sounds reasonable to me.

comment:5 Changed 7 years ago by ohanar

Yes, with the slight modification

  1. for each un-tracked file, either begin tracking it, or move it into src/

There are two packages (cliquer and mpfr) that have untracked patch files, which also cause issue.

comment:6 Changed 7 years ago by vbraun

  • Dependencies set to #14754

I've modified the ATLAS spkg along these lines on #14754

comment:7 Changed 7 years ago by vbraun

  • Dependencies changed from #14754 to #14754, #14869, #14349

I've made #14869 to deal with MPFR, and cliquer will be fixed at #14349

comment:8 Changed 7 years ago by vbraun

  • Dependencies changed from #14754, #14869, #14349 to #14754, #14869, #14349, #14876

NTL is at #14876

comment:9 Changed 7 years ago by vbraun

  • Dependencies changed from #14754, #14869, #14349, #14876 to #14754, #14869, #14349, #14692

The NTL fix is at #14692. The version bump to ntl-6.0.0 will be dealt with at #14876

comment:10 Changed 7 years ago by vbraun

  • Dependencies changed from #14754, #14869, #14349, #14692 to #14754, #14869, #14349, #14692, #14737

Singular fix is at #14737

comment:11 Changed 7 years ago by vbraun

  • Dependencies changed from #14754, #14869, #14349, #14692, #14737 to #14892, #14754, #14869, #14692, #14737,

I've decided to split the "fix everything that is wrong with cliquer" ticket, all we need for the git transition is #14892

comment:12 Changed 7 years ago by vbraun

  • Type changed from defect to task

comment:13 Changed 7 years ago by vbraun

  • Status changed from new to needs_review

Task has been completed ;-)

comment:14 Changed 7 years ago by ohanar

Thanks for looking into this.

Review in progress :)

comment:15 Changed 7 years ago by ohanar

  • Status changed from needs_review to positive_review

comment:16 Changed 7 years ago by jdemeyer

  • Reviewers set to R. Andrew Ohana

comment:17 Changed 7 years ago by jdemeyer

  • Milestone changed from sage-5.11 to sage-5.12

comment:18 Changed 7 years ago by jdemeyer

  • Merged in set to sage-5.12.beta1
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:19 Changed 7 years ago by jdemeyer

  • Merged in sage-5.12.beta1 deleted
Note: See TracTickets for help on using tickets.