Changes between Version 10 and Version 11 of Repositories


Ignore:
Timestamp:
Aug 4, 2011 7:53:53 AM (3 years ago)
Author:
simonmar
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • Repositories

    v10 v11  
    77GHC's repos use Git; see [wiki:WorkingConventions/Git].  For Darcs-related stuff see also [wiki:DarcsToGit] and [wiki:GitForDarcsUsers].  For instructions for building from !GitHub sources, see [wiki:GitHubGHC]. 
    88 
    9 == The HEAD == 
     9== Overview == 
    1010 
    11 The Master List of repositories is in the file [http://darcs.haskell.org/ghc/packages $(TOP)/packages].  It is authoritative.  Everything else in this sub-section may be out of date, although it gives the right general idea. 
     11A GHC source tree is made of a collection of repositories.  The script [wiki:Building/SyncAll sync-all] knows how to apply git commands to the whole collection of repositories at once, for example to pull changes from the upstream repositories. 
    1212 
    13 These repositories are the HEAD (main trunk) of GHC development: 
     13The root of the source tree is the GHC repository itself, the other repositories live in various subdirectories.  The Master List of repositories is in the file source:packages, and this is where the `sync-all` script finds out about which repositories make up the complete tree. 
    1414 
    15 ||[http://darcs.haskell.org/ghc.git]||The main GHC repository|| 
    16 ||[http://darcs.haskell.org/testsuite.git]||The test suite (requires python 2.4+) || 
    17 ||[http://darcs.haskell.org/nofib.git]||The benchmark suite|| 
     15Some repositories are optional: 
    1816 
    19 Our repositories are either git repo, or darcs "hashed" format repos. You need Darcs version 2 or later (preferably 2.4 or later) to get the darcs repos. Use darcs's `--lazy` option when getting the repository remotely to dramatically speed up the transfer. 
     17 * The `testsuite` is not necessary for a build, but is necessary if you're working on GHC 
     18 * The `nofib` repository is for benchmarking 
     19 * The `dph` repositories provide packages for Data Parallel Haskell, which is not shipped with GHC but we test all changes to GHC against these repositories so they are usually included in a checked-out source tree. 
     20 * The `extra` repositories are some extra packages you might want to include in a build (the `parallel` package, for example), but aren't necessary to get a working GHC. 
    2021 
    21 The following repositories are the "GHC boot" libraries, i.e. the set of libraries that are necessary to build GHC (i.e. they are used when building the stage 2 compiler). They populate the libraries/ directory of a GHC tree. 
     22== Repository locations == 
    2223 
    23 ||http://darcs.haskell.org/packages/array.git|| 
    24 ||http://darcs.haskell.org/packages/base.git|| 
    25 ||http://darcs.haskell.org/packages/bytestring.git|| 
    26 ||http://darcs.haskell.org/packages/Cabal.git|| 
    27 ||http://darcs.haskell.org/packages/containers.git|| 
    28 ||http://darcs.haskell.org/packages/directory.git|| 
    29 ||http://darcs.haskell.org/packages/filepath.git|| 
    30 ||http://darcs.haskell.org/packages/haskell98.git|| 
    31 ||http://darcs.haskell.org/packages/old-locale.git|| 
    32 ||http://darcs.haskell.org/packages/old-time.git|| 
    33 ||http://darcs.haskell.org/packages/packedstring.git|| 
    34 ||http://darcs.haskell.org/packages/pretty.git|| 
    35 ||http://darcs.haskell.org/packages/process.git|| 
    36 ||http://darcs.haskell.org/packages/random.git|| 
    37 ||http://darcs.haskell.org/packages/readline.git|| 
    38 ||http://darcs.haskell.org/packages/template-haskell.git|| 
    39 ||http://darcs.haskell.org/packages/unix.git|| 
    40 ||http://darcs.haskell.org/packages/Win32.git|| 
    41 ||http://darcs.haskell.org/packages/hpc.git|| 
     24Many of the libraries and tools in a GHC tree are actually maintained by someone else. They therefore have a separate upstream repository, from which we need to pull. That repository may be either a darcs or a git repository; in the darcs case, we also need to convert to a git repository for use in a GHC tree. However, if the darcs repository is on another server, then we first need to mirror it for the conversion program to use. This diagram shows how changes migrate from one repo to another: 
    4225 
    43 Additionally a GHC build needs these two tools: 
     26[[Image(repos.png)]] 
    4427 
    45 ||http://darcs.haskell.org/hsc2hs.git|| 
    46 ||http://darcs.haskell.org/haddock2.git|| 
     28This means that when making changes needed in GHC to one of these libraries, we first need to put the changes in the upstream repository. For example, to make a change to Cabal: 
     29 
     30 * First push the change as a darcs patch to the upstream Cabal repository, http://code.haskell.org/Cabal/ 
     31 * The patch will be mirrored and converted to git by the mirror script, in the repo http://darcs.haskell.org/git-mirrors/Cabal/.git/ 
     32 * You then need to pull from http://darcs.haskell.org/git-mirrors/Cabal/.git/ into `libraries/Cabal` in a regular GHC tree, validate, and push to the GHC Cabal repo, http://darcs.haskell.org/packages/Cabal.git/ 
     33 
     34{{{ 
     35#!html 
     36 
     37<p>This table shows, for each repository in a GHC tree, where the <span style="color: green;">central repository</span> is, and what mirrors there are.</p> 
     38 
     39<table border="2"> 
     40<tr><td colspan="2">darcs</td><td colspan="4">git</td><td></td></tr> 
     41<tr><td>darcs upstream</td><td>darcs mirror</td><td>git upstream</td><td>git mirror</td><td>ghc (validated) repo</td><td>in-tree</td><td></td></tr> 
     42<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/ghc.git/</td><td>.</td><td rowspan="33">ghc</td></tr> 
     43<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/ghc-tarballs.git/</td><td>ghc-tarballs</td></tr> 
     44<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/utils/hsc2hs.git/</td><td>utils/hsc2hs</td></tr> 
     45<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/haddock.git</td><td>utils/haddock</td></tr> 
     46<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/array.git/</td><td>libraries/array</td></tr> 
     47<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/base.git/</td><td>libraries/base</td></tr> 
     48<tr><td></td><td></td><td style="color: green;">git://github.com/kolmodin/binary.git</td><td>http://darcs.haskell.org/git-mirrors/binary/binary.git/</td><td>http://darcs.haskell.org/packages/.git/</td><td>libraries/binary</td></tr> 
     49<tr><td style="color: green;">http://darcs.haskell.org/bytestring/</td><td></td><td></td><td>http://darcs.haskell.org/git-mirrors/bytestring/.git/</td><td>http://darcs.haskell.org/packages/bytestring.git/</td><td>libraries/bytestring</td></tr> 
     50<tr><td style="color: green;">http://code.haskell.org/Cabal/</td><td></td><td></td><td>http://darcs.haskell.org/git-mirrors/Cabal/.git/</td><td>http://darcs.haskell.org/packages/Cabal.git/</td><td>libraries/Cabal</td></tr> 
     51<tr><td></td><td></td><td style="color: green;">git://github.com/haskell/containers.git</td><td>http://darcs.haskell.org/git-mirrors/containers/.git/</td><td>http://darcs.haskell.org/packages/containers.git/</td><td>libraries/containers</td></tr> 
     52<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/directory.git/</td><td>libraries/directory</td></tr> 
     53<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/extensible-exceptions.git/</td><td>libraries/extensible-exceptions</td></tr> 
     54<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/filepath.git/</td><td>libraries/filepath</td></tr> 
     55<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/ghc-prim.git/</td><td>libraries/ghc-prim</td></tr> 
     56<tr><td style="color: green;">http://code.haskell.org/haskeline/</td><td>http://darcs.haskell.org/darcs-mirrors/haskeline/</td><td></td><td>http://darcs.haskell.org/git-mirrors/haskeline/.git/</td><td>http://darcs.haskell.org/packages/haskeline.git/</td><td>libraries/haskeline</td></tr> 
     57<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/haskell98.git/</td><td>libraries/haskell98</td></tr> 
     58<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/haskell2010.git/</td><td>libraries/haskell2010</td></tr> 
     59<tr><td></td><td></td><td style="color: green;">git://code.eecs.tufts.edu/hoopl/hoopl.git</td><td>http://darcs.haskell.org/git-mirrors/hoopl/</td><td>http://darcs.haskell.org/packages/hoopl.git/</td><td>libraries/hoopl</td></tr> 
     60<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/hpc.git/</td><td>libraries/hpc</td></tr> 
     61<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/integer-gmp.git/</td><td>libraries/integer-gmp</td></tr> 
     62<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/integer-simple.git/</td><td>libraries/integer-simple</td></tr> 
     63<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/mtl.git/</td><td>libraries/mtl</td></tr> 
     64<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/old-locale.git/</td><td>libraries/old-locale</td></tr> 
     65<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/old-time.git/</td><td>libraries/old-time</td></tr> 
     66<tr><td></td><td></td><td style="color: green;">git://github.com/haskell/pretty.git</td><td>http://darcs.haskell.org/git-mirrors/pretty/</td><td>http://darcs.haskell.org/packages/pretty.git/</td><td>libraries/pretty</td></tr> 
     67<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/process.git/</td><td>libraries/process</td></tr> 
     68<tr><td></td><td></td><td style="color: green;">git://github.com/rrnewton/haskell_stdlib_random.git</td><td>http://darcs.haskell.org/git-mirrors/random/</td><td>http://darcs.haskell.org/packages/random.git/</td><td>libraries/random</td></tr> 
     69<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/template-haskell.git/</td><td>libraries/template-haskell</td></tr> 
     70<tr><td style="color: green;">http://code.haskell.org/terminfo/</td><td>http://darcs.haskell.org/darcs-mirrors/terminfo/</td><td></td><td>http://darcs.haskell.org/git-mirrors/terminfo/.git/</td><td>http://darcs.haskell.org/packages/terminfo.git/</td><td>libraries/terminfo</td></tr> 
     71<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/unix.git/</td><td>libraries/unix</td></tr> 
     72<tr><td></td><td></td><td style="color: green;">https://github.com/glguy/utf8-string.git</td><td></td><td>http://darcs.haskell.org/packages/utf8-string.git/</td><td>libraries/utf8-string</td></tr> 
     73<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/Win32.git/</td><td>libraries/Win32</td></tr> 
     74<tr><td style="color: green;">http://darcs.haskell.org/packages/xhtml/</td><td>http://darcs.haskell.org/darcs-mirrors/xhtml/</td><td></td><td>http://darcs.haskell.org/git-mirrors/xhtml/.git/</td><td>http://darcs.haskell.org/packages/xhtml.git/</td><td>libraries/xhtml</td></tr> 
     75<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/testsuite.git/</td><td>testsuite</td><td>testsuite</td></tr> 
     76<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/nofib.git</td><td>nofib</td><td>nofib</td></tr> 
     77<tr><td style="color: green;">http://code.haskell.org/primitive/</td><td>http://darcs.haskell.org/darcs-mirrors/primitive/</td><td></td><td>http://darcs.haskell.org/git-mirrors/primitive/.git/</td><td>http://darcs.haskell.org/packages/primitive.git/</td><td>libraries/primitive</td><td rowspan="3">dph</td></tr> 
     78<tr><td style="color: green;">http://code.haskell.org/vector/</td><td>http://darcs.haskell.org/darcs-mirrors/vector/</td><td></td><td>http://darcs.haskell.org/git-mirrors/vector/.git/</td><td>http://darcs.haskell.org/packages/vector.git/</td><td>libraries/vector</td></tr> 
     79<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/dph.git/</td><td>libraries/dph</td></tr> 
     80<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/deepseq.git/</td><td>libraries/deepseq</td><td rowspan="3">extra</td></tr> 
     81<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/parallel.git/</td><td>libraries/parallel</td></tr> 
     82<tr><td></td><td></td><td></td><td></td><td style="color: green;">http://darcs.haskell.org/packages/stm.git/</td><td>libraries/stm</td></tr> 
     83</table> 
     84}}} 
     85 
     86== Mirroring new packages to !GitHub == 
     87 
     88Currently, all our repositories are being mirrored to !GitHub by !GitHub themselves. If you wish to add/remove a repository you need to email !GitHub support at support@github.com and ask them to do it. Currently there is no way to administer this ourselves. 
    4789 
    4890== Branches ==