[commit: haddock] master: Bump interface version (2aec8fd)

git at git.haskell.org git at git.haskell.org
Sun Jan 12 20:51:40 UTC 2014


Repository : ssh://git@git.haskell.org/haddock

On branch  : master
Link       : http://git.haskell.org/haddock.git/commitdiff/2aec8fdde55579b62f480c6b2a567bd5392fdff2

>---------------------------------------------------------------

commit 2aec8fdde55579b62f480c6b2a567bd5392fdff2
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Jan 9 00:11:35 2014 +0000

    Bump interface version
    
    There were some breaking changes over the last few patches so we bump
    the interface version. This causes a big problem with testing:
    
    1. To generate cross package docs, we first need to generate docs for
    the package used.
    2. To generate package docs with new interface version, we need to use
    Haddock which has the version bumped.
    3. To get Haddock with the version bump, we first need to test cross
    package docs
    4. GOTO 1
    
    So the problem is the chicken and the egg problem. It seems that the
    only solution would be to generate some interface files on the fly but
    it is non-trivial.
    
    To run this test, you'll have to:
    
    * build Haddock without the test (make sure everything else passes)
    * rebuild the packages used in the test with your shiny new binary
      making sure they are visible to Haddock
    * remove the ‘_hidden’ suffix and re-run the tests
    
    Note: because the packages currently used for this test are those
    provided by GHC, it's probably non-trivial to just re-build them.
    Preferably something less tedious to rebuild should be used and
    something that is not subject to change.


>---------------------------------------------------------------

2aec8fdde55579b62f480c6b2a567bd5392fdff2
 html-test/src/{CrossPackageDocs.hs => CrossPackageDocs.hs_hidden} |    0
 src/Haddock/InterfaceFile.hs                                      |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/html-test/src/CrossPackageDocs.hs b/html-test/src/CrossPackageDocs.hs_hidden
similarity index 100%
rename from html-test/src/CrossPackageDocs.hs
rename to html-test/src/CrossPackageDocs.hs_hidden
diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs
index 81ff17f..e7ea758 100644
--- a/src/Haddock/InterfaceFile.hs
+++ b/src/Haddock/InterfaceFile.hs
@@ -77,7 +77,7 @@ binaryInterfaceMagic = 0xD0Cface
 --
 binaryInterfaceVersion :: Word16
 #if __GLASGOW_HASKELL__ == 707
-binaryInterfaceVersion = 23
+binaryInterfaceVersion = 24
 
 binaryInterfaceVersionCompatibility :: [Word16]
 binaryInterfaceVersionCompatibility = [binaryInterfaceVersion]



More information about the ghc-commits mailing list