Commit 38cfe221 authored by Simon Marlow's avatar Simon Marlow

update tests following package-related changes in GHC/ghc-pkg

parent 69e6b24e
WARNING: there are broken packages. Run 'ghc-pkg check' for more details.
local1750.package.conf:
{1750A-1}, {1750B-1}
{1750A-1}
{1750B-1}
......@@ -159,9 +159,10 @@ GHC_PKG_COPY = $(GHC_PKG) --no-user-package-conf --global-conf=$(COPY_PACKAGE_CO
INPLACE_DATA_DIR = $(TOP)/../inplace/lib
ghcpkg02:
cp -r $(INPLACE_DATA_DIR)/package.conf $(COPY_PACKAGE_CONF)
rm -rf $(COPY_PACKAGE_CONF)
cp -r $(INPLACE_DATA_DIR)/package.conf.d $(COPY_PACKAGE_CONF)
set -e; \
for i in `$(GHC_PKG_COPY) list --global --simple-output`; do \
for i in `$(GHC_PKG_COPY) list --global --simple-output -v0`; do \
echo Updating $$i; \
$(GHC_PKG_COPY) describe --global $$i | $(GHC_PKG_COPY) update --global --force -; \
done
......@@ -10,4 +10,3 @@ package.conf.inplace
setup-config
src
test-1.0.tar.gz
Writing new package config file... done.
local01.package.conf:
Reading package info from "test.pkg" ... done.
Writing new package config file... done.
name: testpkg
......@@ -65,7 +66,9 @@ import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
Reading package info from "test2.pkg" ... done.
Writing new package config file... done.
local01.package.conf:
testpkg-1.2.3.4, (testpkg-2.0)
testpkg-1.2.3.4
(testpkg-2.0)
name: testpkg
version: 2.0
id: testpkg-2.0-XXX
......@@ -97,23 +100,23 @@ frameworks:
haddock-interfaces:
haddock-html:
name: testpkg
version: 1.2.3.4
id: testpkg-1.2.3.4-XXX
version: 2.0
id: testpkg-2.0-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: stable
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package
description: A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: True
exposed: False
exposed-modules: A
hidden-modules: B C.D
hidden-modules: B C.D C.E
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4
hs-libraries: testpkg-2.0
extra-libraries:
extra-ghci-libraries:
include-dirs:
......@@ -128,23 +131,23 @@ haddock-interfaces:
haddock-html:
---
name: testpkg
version: 2.0
id: testpkg-2.0-XXX
version: 1.2.3.4
id: testpkg-1.2.3.4-XXX
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: unstable
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package (new version)
description: A Test Package
category: none
author: simonmar@microsoft.com
exposed: False
exposed: True
exposed-modules: A
hidden-modules: B C.D C.E
hidden-modules: B C.D
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-2.0
hs-libraries: testpkg-1.2.3.4
extra-libraries:
extra-ghci-libraries:
include-dirs:
......@@ -157,8 +160,8 @@ framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
version: 1.2.3.4
version: 2.0
version: 1.2.3.4
Writing new package config file... done.
exposed: False
Writing new package config file... done.
......@@ -202,4 +205,5 @@ haddock-interfaces:
haddock-html:
Writing new package config file... done.
local01.package.conf:
Reading package info from "test3.pkg" ... done.
local05a.package.conf:
(testpkg-2.0)
local05b.package.conf:
(testpkg-3.0)
Writing new package config file... done.
Writing new package config file... done.
Writing new package config file... done.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment