Hannes Siebenhandl pushed to branch wip/fendor/ghc-pkg-ospath at Glasgow Haskell Compiler / GHC
Commits:
-
0db070a3
by Fendor at 2026-02-25T13:14:38+01:00
3 changed files:
Changes:
| ... | ... | @@ -79,6 +79,25 @@ ghcpkg04 : |
| 79 | 79 | @: # testpkg-1.2.3.4 and newtestpkg-2.0 are both exposed now
|
| 80 | 80 | '$(TEST_HC)' $(TEST_HC_OPTS) -package-db $(PKGCONF04) -c ghcpkg04.hs || true
|
| 81 | 81 | |
| 82 | +PKGCONF20=local20.package.conf
|
|
| 83 | +LOCAL_GHC_PKG20 = '$(GHC_PKG)' --no-user-package-db
|
|
| 84 | + |
|
| 85 | +DIR1=asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf
|
|
| 86 | +DIR2=zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv
|
|
| 87 | +DIR3=uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop
|
|
| 88 | +DIR4=qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer
|
|
| 89 | +WDIR=$(DIR1)/$(DIR2)/$(DIR3)/$(DIR4)
|
|
| 90 | +.PHONY: ghcpkg10
|
|
| 91 | +ghcpkg10 :
|
|
| 92 | + @mkdir -p $(WDIR)
|
|
| 93 | + @rm -rf $(WDIR)/$(PKGCONF20)
|
|
| 94 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) init $(WDIR)/$(PKGCONF20)
|
|
| 95 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) list
|
|
| 96 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) register --force test.pkg 2>/dev/null
|
|
| 97 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) describe testpkg | $(STRIP_PKGROOT)
|
|
| 98 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) describe testpkg-1.2.3.4 | $(STRIP_PKGROOT)
|
|
| 99 | + $(LOCAL_GHC_PKG20) -f $(WDIR)/$(PKGCONF20) field testpkg-1.2.3.4 import-dirs
|
|
| 100 | + |
|
| 82 | 101 | # Test stacking of package.confs (also #2441)
|
| 83 | 102 | PKGCONF05a=local05a.package.conf
|
| 84 | 103 | PKGCONF05b=local05b.package.conf
|
| ... | ... | @@ -5,6 +5,7 @@ def ignore_warnings(str): |
| 5 | 5 | return re.sub(r'Warning:.*\n', '', str)
|
| 6 | 6 | |
| 7 | 7 | test('ghcpkg01', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, [])
|
| 8 | +test('ghcpkg10', [extra_files(['test.pkg', 'test2.pkg', 'test3.pkg'])], makefile_test, [])
|
|
| 8 | 9 | |
| 9 | 10 | # Use ignore_stderr to prevent (when HADDOCK_DOCS=NO):
|
| 10 | 11 | # warning: haddock-interfaces .. doesn't exist or isn't a file
|
| 1 | +"asdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdf/zxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcvzxcv/uiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiopuiop/qwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwerqwer/local20.package.conf"
|
|
| 2 | + (no packages)
|
|
| 3 | +Reading package info from "test.pkg" ... done.
|
|
| 4 | +name: testpkg
|
|
| 5 | +version: 1.2.3.4
|
|
| 6 | +visibility: public
|
|
| 7 | +id: testpkg-1.2.3.4-XXX
|
|
| 8 | +key: testpkg-1.2.3.4-XXX
|
|
| 9 | +license: BSD3
|
|
| 10 | +copyright: (c) The Univsersity of Glasgow 2004
|
|
| 11 | +maintainer: glasgow-haskell-users@haskell.org
|
|
| 12 | +author: simonmar@microsoft.com
|
|
| 13 | +stability: stable
|
|
| 14 | +homepage: http://www.haskell.org/ghc
|
|
| 15 | +package-url: http://www.haskell.org/ghc
|
|
| 16 | +description: A Test Package
|
|
| 17 | +category: none
|
|
| 18 | +exposed: True
|
|
| 19 | +exposed-modules: A
|
|
| 20 | +hidden-modules: B C.D
|
|
| 21 | +import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
|
|
| 22 | +library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
|
|
| 23 | +hs-libraries: testpkg-1.2.3.4-XXX
|
|
| 24 | +include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
|
|
| 25 | +pkgroot:
|
|
| 26 | + |
|
| 27 | +name: testpkg
|
|
| 28 | +version: 1.2.3.4
|
|
| 29 | +visibility: public
|
|
| 30 | +id: testpkg-1.2.3.4-XXX
|
|
| 31 | +key: testpkg-1.2.3.4-XXX
|
|
| 32 | +license: BSD3
|
|
| 33 | +copyright: (c) The Univsersity of Glasgow 2004
|
|
| 34 | +maintainer: glasgow-haskell-users@haskell.org
|
|
| 35 | +author: simonmar@microsoft.com
|
|
| 36 | +stability: stable
|
|
| 37 | +homepage: http://www.haskell.org/ghc
|
|
| 38 | +package-url: http://www.haskell.org/ghc
|
|
| 39 | +description: A Test Package
|
|
| 40 | +category: none
|
|
| 41 | +exposed: True
|
|
| 42 | +exposed-modules: A
|
|
| 43 | +hidden-modules: B C.D
|
|
| 44 | +import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
|
|
| 45 | +library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
|
|
| 46 | +hs-libraries: testpkg-1.2.3.4-XXX
|
|
| 47 | +include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
|
|
| 48 | +pkgroot:
|
|
| 49 | + |
|
| 50 | +import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" |