#11073: remove the spkg/base repo!
---------------------------+------------------------------------------------
Reporter: jhpalmieri | Owner: GeorgSWeber
Type: enhancement | Status: needs_review
Priority: blocker | Milestone: sage-4.7.1
Component: build | Keywords: scripts base hg
Work_issues: | Upstream: N/A
Reviewer: | Author: Volker Braun
Merged: | Dependencies:
---------------------------+------------------------------------------------
Old description:
> Given the creation of the Sage root repo (see #9433), perhaps the
> repository in SAGE_ROOT/spkg/base should be combined with it. See
> [http://mercurial.selenic.com/wiki/MergingUnrelatedRepositories this
> page] for one way to merge Mercurial repositories; another option would
> be to keep the base repo as a
> [http://mercurial.selenic.com/wiki/Subrepository subrepository] of the
> root repo.
>
> Is there a good way to avoid the current duplication between
> SAGE_ROOT/local/bin and SAGE_ROOT/spkg/base? Right now, both contain
> identical copies of the scripts sage-env, sage-spkg, and sage-
> make_relative, courtesy of the sage-sdist script, but if the copies
> somehow get out of sync, then building from scratch tends to break.
>
> One small issue which should be fixed regardless: from SAGE_ROOT:
> {{{
> $ cd spkg/base
> $ hg status
> ? sage-check-64
> }}}
> The script sage-check-64 should be removed from this directory. (It was
> added, but .hgignore wasn't modified, when #10303 was merged, and then it
> wasn't removed when #10303 was backed out.)
New description:
Given the creation of the Sage root repo (see #9433), the repository in
`SAGE_ROOT/spkg/base` should be combined with it.
1) remove everything but the tar archives from spkg/base
{{{
cd $SAGE_ROOT/spkg/base
rm -rf .hg .hgignore *-install README.txt sage-* test*sh stdint.h_Solaris9
}}}
2) apply [attachment:trac_11073_remove_base_repo.patch] to the root repo
3) apply [attachment:trac_11073_stop_copying_stuff.patch] to the root repo
4) apply [attachment:trac_11073_stubs_for_base.patch] to the scripts repo
Some notes about files formerly in the spkg/base repository:
* `stdint.h_Solaris9`: deleted
* `sage-spkg`: deleted from sage_scripts, should live in sage_root only.
* `sage-env`: replaced by stub in sage_scripts.
* `testcc.sh`, `testcxx.sh`: replaced by stub in sage_scripts
* `sage-make_relative`: was a Python script, but base doesn't have
Python yet ?!?. Deleted.
--
Comment(by vbraun):
Forgot to delete `SAGE_ROOT/spkg/base/.hgignore`, instructions moved to
ticket description so they can be edited.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/11073#comment:17>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
