Remove upstream repos from the packages file

We no longer pull directly from upstream repos, so it wasn't useful
to have it programatically available. The info, and more, is now on
    http://hackage.haskell.org/trac/ghc/wiki/Commentary/Libraries#Repositorylocations
instead.

diff --git a/boot b/boot
index 0b67b17..08d4846 100755 (executable)
--- a/boot
+++ b/boot
@@ -58,7 +58,7 @@ sub sanity_check_tree {
         if (/^#/) {
             # Comment; do nothing
         }
         if (/^#/) {
             # Comment; do nothing
         }

-        elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+ +[^ ]+$/) {
+        elsif (/^([a-zA-Z0-9\/.-]+) +([^ ]+) +[^ ]+ +[^ ]+$/) {

             $dir = $1;
             $tag = $2;
 
             $dir = $1;
             $tag = $2;
 

diff --git a/packages b/packages
index 9720329..1489f3e 100644 (file)
--- a/packages
+++ b/packages
@@ -1,5 +1,5 @@
 # Despite the name "package", this file contains the master list of 
 # Despite the name "package", this file contains the master list of 

-# the *repositories* that make up GHC. It is parsed by boot and darcs-all.
+# the *repositories* that make up GHC. It is parsed by boot and sync-all.

 #
 # Some of this information is duplicated elsewhere in the build system:
 #    See Trac #3896
 #
 # Some of this information is duplicated elsewhere in the build system:
 #    See Trac #3896

@@ -17,7 +17,7 @@
 #    - nofib and testsuite are optional helpers
 #
 # The format of the lines in this file is:
 #    - nofib and testsuite are optional helpers
 #
 # The format of the lines in this file is:

-#   localpath    tag    remotepath    VCS    upstream
+#   localpath    tag    remotepath    VCS

 # where
 #   * 'localpath' is where to put the repository in a checked out tree.
 #   * 'remotepath' is where the repository is in the central repository.
 # where
 #   * 'localpath' is where to put the repository in a checked out tree.
 #   * 'remotepath' is where the repository is in the central repository.

@@ -34,52 +34,45 @@
 #     deems to have the EXTRA_PACKAGE property: tags 'dph' and 'extra' 
 #     both give this property
 #
 #     deems to have the EXTRA_PACKAGE property: tags 'dph' and 'extra' 
 #     both give this property
 #

-#   * 'upstream' is the URL of the upstream repo, where there is one, or
-#     "-" if there is no upstream.
-#

 # Lines that start with a '#' are comments.
 # Lines that start with a '#' are comments.

-.                               -           ghc.git                             git   -
-ghc-tarballs                    -           ghc-tarballs.git                    git   -
-utils/hsc2hs                    -           hsc2hs.git                          git   -
-# haddock does have an upstream:
-#   http://code.haskell.org/haddock/
-# but it stays buildable with the last stable release rather than tracking HEAD,
-# and is resynced with the GHC HEAD branch by David Waern when appropriate
-utils/haddock                   -           haddock2.git                        git   -
-libraries/array                 -           packages/array.git                  git   -
-libraries/base                  -           packages/base.git                   git   -
-libraries/binary                -           packages/binary.git                 git   http://code.haskell.org/binary/
-libraries/bytestring            -           packages/bytestring.git             git   http://darcs.haskell.org/bytestring/
-libraries/Cabal                 -           packages/Cabal.git                  git   http://darcs.haskell.org/cabal/
-libraries/containers            -           packages/containers.git             git   -
-libraries/directory             -           packages/directory.git              git   -
-libraries/extensible-exceptions -           packages/extensible-exceptions.git  git   -
-libraries/filepath              -           packages/filepath.git               git   -
-libraries/ghc-prim              -           packages/ghc-prim.git               git   -
-libraries/haskeline             -           packages/haskeline.git              git   http://code.haskell.org/haskeline/
-libraries/haskell98             -           packages/haskell98.git              git   -
-libraries/haskell2010           -           packages/haskell2010.git            git   -
-libraries/hoopl                 -           packages/hoopl.git                  git   -
-libraries/hpc                   -           packages/hpc.git                    git   -
-libraries/integer-gmp           -           packages/integer-gmp.git            git   -
-libraries/integer-simple        -           packages/integer-simple.git         git   -
-libraries/mtl                   -           packages/mtl.git                    git   -
-libraries/old-locale            -           packages/old-locale.git             git   -
-libraries/old-time              -           packages/old-time.git               git   -
-libraries/pretty                -           packages/pretty.git                 git   -
-libraries/process               -           packages/process.git                git   -
-libraries/random                -           packages/random.git                 git   -
-libraries/template-haskell      -           packages/template-haskell.git       git   -
-libraries/terminfo              -           packages/terminfo.git               git   http://code.haskell.org/terminfo/
-libraries/unix                  -           packages/unix.git                   git   -
-libraries/utf8-string           -           packages/utf8-string.git            git   http://code.haskell.org/utf8-string/
-libraries/Win32                 -           packages/Win32.git                  git   -
-libraries/xhtml                 -           packages/xhtml.git                  git   -
-testsuite                       testsuite   testsuite.git                       git   -
-nofib                           nofib       nofib.git                           git   -
-libraries/deepseq               extra       packages/deepseq.git                git   -
-libraries/parallel              extra       packages/parallel.git               git   -
-libraries/stm                   extra       packages/stm.git                    git   -
-libraries/primitive             dph         packages/primitive.git              git   http://code.haskell.org/primitive
-libraries/vector                dph         packages/vector.git                 git   http://code.haskell.org/vector
-libraries/dph                   dph         packages/dph.git                    git   -
+.                               -           ghc.git                             git
+ghc-tarballs                    -           ghc-tarballs.git                    git
+utils/hsc2hs                    -           hsc2hs.git                          git
+utils/haddock                   -           haddock2.git                        git
+libraries/array                 -           packages/array.git                  git
+libraries/base                  -           packages/base.git                   git
+libraries/binary                -           packages/binary.git                 git
+libraries/bytestring            -           packages/bytestring.git             git
+libraries/Cabal                 -           packages/Cabal.git                  git
+libraries/containers            -           packages/containers.git             git
+libraries/directory             -           packages/directory.git              git
+libraries/extensible-exceptions -           packages/extensible-exceptions.git  git
+libraries/filepath              -           packages/filepath.git               git
+libraries/ghc-prim              -           packages/ghc-prim.git               git
+libraries/haskeline             -           packages/haskeline.git              git
+libraries/haskell98             -           packages/haskell98.git              git
+libraries/haskell2010           -           packages/haskell2010.git            git
+libraries/hoopl                 -           packages/hoopl.git                  git
+libraries/hpc                   -           packages/hpc.git                    git
+libraries/integer-gmp           -           packages/integer-gmp.git            git
+libraries/integer-simple        -           packages/integer-simple.git         git
+libraries/mtl                   -           packages/mtl.git                    git
+libraries/old-locale            -           packages/old-locale.git             git
+libraries/old-time              -           packages/old-time.git               git
+libraries/pretty                -           packages/pretty.git                 git
+libraries/process               -           packages/process.git                git
+libraries/random                -           packages/random.git                 git
+libraries/template-haskell      -           packages/template-haskell.git       git
+libraries/terminfo              -           packages/terminfo.git               git
+libraries/unix                  -           packages/unix.git                   git
+libraries/utf8-string           -           packages/utf8-string.git            git
+libraries/Win32                 -           packages/Win32.git                  git
+libraries/xhtml                 -           packages/xhtml.git                  git
+testsuite                       testsuite   testsuite.git                       git
+nofib                           nofib       nofib.git                           git
+libraries/deepseq               extra       packages/deepseq.git                git
+libraries/parallel              extra       packages/parallel.git               git
+libraries/stm                   extra       packages/stm.git                    git
+libraries/primitive             dph         packages/primitive.git              git
+libraries/vector                dph         packages/vector.git                 git
+libraries/dph                   dph         packages/dph.git                    git

diff --git a/sync-all b/sync-all
index 8b41c97..ac06af1 100755 (executable)
--- a/sync-all
+++ b/sync-all
@@ -142,13 +142,12 @@ sub parsePackages {
     foreach (@repos) {
         chomp;
         $lineNum++;
     foreach (@repos) {
         chomp;
         $lineNum++;

-        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {
+        if (/^([^# ]+) +([^ ]+) +([^ ]+) +([^ ]+)$/) {

             my %line;
             $line{"localpath"}  = $1;
             $line{"tag"}        = $2;
             $line{"remotepath"} = $3;
             $line{"vcs"}        = $4;
             my %line;
             $line{"localpath"}  = $1;
             $line{"tag"}        = $2;
             $line{"remotepath"} = $3;
             $line{"vcs"}        = $4;

-            $line{"upstream"}   = $5;

             push @packages, \%line;
         }
         elsif (! /^(#.*)?$/) {
             push @packages, \%line;
         }
         elsif (! /^(#.*)?$/) {

@@ -198,7 +197,6 @@ sub scmall {
     my $tag;
     my $remotepath;
     my $scm;
     my $tag;
     my $remotepath;
     my $scm;

-    my $upstream;

     my $line;
     my $branch_name;
     my $subcommand;
     my $line;
     my $branch_name;
     my $subcommand;

@@ -252,7 +250,6 @@ sub scmall {
         $tag        = $$line{"tag"};
         $remotepath = $$line{"remotepath"};
         $scm        = $$line{"vcs"};
         $tag        = $$line{"tag"};
         $remotepath = $$line{"remotepath"};
         $scm        = $$line{"vcs"};

-        $upstream   = $$line{"upstream"};

 
         # Check the SCM is OK as early as possible
         die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));
 
         # Check the SCM is OK as early as possible
         die "Unknown SCM: $scm" if (($scm ne "darcs") and ($scm ne "git"));