diff --git a/Changelog.md b/Changelog.md --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,7 @@ +### 0.5.0.1 + +- More detailed help for *nhm-tool*. + ### 0.5.0.0 - Build executable *nhm-tool* to replace utilities *hslibdeps* and *nhm-init*. diff --git a/NgxExport/Distribution.hs b/NgxExport/Distribution.hs --- a/NgxExport/Distribution.hs +++ b/NgxExport/Distribution.hs @@ -153,37 +153,37 @@ -- -- > $ cabal v1-build --ghc-options="ngx_distribution_test.hs -o ngx_distribution_test.so -threaded" -- > [1 of 2] Compiling NgxDistributionTest ( ngx_distribution_test.hs, ngx_distribution_test.o ) --- > [2 of 2] Linking ngx_distribution_test.so ... +-- > [2 of 2] Linking ngx_distribution_test.so -- > ---> Collecting libraries --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSngx-export-1.7.5-FkCfFIq2kiq6MpFtZt6Wso-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSngx-export-1.7.5-FkCfFIq2kiq6MpFtZt6Wso-ghc9.4.1.so' --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSmonad-loops-0.4.3-5HNgusEuKV7E9KDl2xfIIb-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSmonad-loops-0.4.3-5HNgusEuKV7E9KDl2xfIIb-ghc9.4.1.so' --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSasync-2.2.4-BHmUTH2SmtgLLoxIOXNoMc-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSasync-2.2.4-BHmUTH2SmtgLLoxIOXNoMc-ghc9.4.1.so' --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSaeson-2.1.0.0-79sgaqQ0msAJaL6HuNRLaK-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSaeson-2.1.0.0-79sgaqQ0msAJaL6HuNRLaK-ghc9.4.1.so' --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSwitherable-0.4.2-1AWCu2zvFImLTaoXk8CRkT-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSwitherable-0.4.2-1AWCu2zvFImLTaoXk8CRkT-ghc9.4.1.so' --- > '/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1/libHSuuid-types-1.0.5-BduubbeXxFCF9me5IkbXLU-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSuuid-types-1.0.5-BduubbeXxFCF9me5IkbXLU-ghc9.4.1.so' +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so +-- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSaeson-2.2.0.0-KcH800TS6us8tZ6AZDtIQh-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSaeson-2.2.0.0-KcH800TS6us8tZ6AZDtIQh-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so -- > -- > ... -- > --- > '/usr/lib64/ghc-9.4.1/lib/../lib/x86_64-linux-ghc-9.4.1/libHSghc-bignum-1.3-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSghc-bignum-1.3-ghc9.4.1.so' --- > '/usr/lib64/ghc-9.4.1/lib/../lib/x86_64-linux-ghc-9.4.1/libHSghc-prim-0.9.0-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSghc-prim-0.9.0-ghc9.4.1.so' --- > '/usr/lib64/ghc-9.4.1/lib/../lib/x86_64-linux-ghc-9.4.1/libHSrts-1.0.2_thr-ghc9.4.1.so' -> 'x86_64-linux-ghc-9.4.1/libHSrts-1.0.2_thr-ghc9.4.1.so' +-- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so +-- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so +-- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so -- > -- > ---> Patching ngx_distribution_test.so --- > /var/lib/nginx/x86_64-linux-ghc-9.4.1:/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.4.1:/usr/lib64/ghc-9.4.1/lib/../lib/x86_64-linux-ghc-9.4.1 +-- > /var/lib/nginx/x86_64-linux-ghc-9.6.2:/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2:/usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2 -- > -- > ---> Archiving artifacts -- > ngx_distribution_test.so --- > x86_64-linux-ghc-9.4.1/ --- > x86_64-linux-ghc-9.4.1/libHSrts-1.0.2_thr-ghc9.4.1.so --- > x86_64-linux-ghc-9.4.1/libHSwitherable-0.4.2-1AWCu2zvFImLTaoXk8CRkT-ghc9.4.1.so --- > x86_64-linux-ghc-9.4.1/libHSsplitmix-0.1.0.4-HUWpFUIlsWJ8kN1EGcaWa2-ghc9.4.1.so --- > x86_64-linux-ghc-9.4.1/libHSscientific-0.3.7.0-C7AyvjqJeHGGsm9gk5kZlS-ghc9.4.1.so +-- > x86_64-linux-ghc-9.6.2/ +-- > x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so -- > -- > ... -- > --- > x86_64-linux-ghc-9.4.1/libHSunix-2.7.3-ghc9.4.1.so --- > x86_64-linux-ghc-9.4.1/libHSpretty-1.1.3.6-ghc9.4.1.so --- > x86_64-linux-ghc-9.4.1/libHSdeepseq-1.4.8.0-ghc9.4.1.so +-- > x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so -- -- Notes about the value of /--ghc-options/ in command /cabal v1-build/. -- @@ -200,7 +200,7 @@ -- -- Now the current working directory contains new files -- /ngx_distribution_test.so/ and /ngx-distribution-test-0.1.0.0.tar.gz/ and a --- new directory /x86_64-linux-ghc-9.4.1/. The tar-file contains the patched +-- new directory /x86_64-linux-ghc-9.6.2/. The tar-file contains the patched -- shared library and the directory with dependent libraries: it is ready for -- installation in directory /\/var\/lib\/nginx/ at the target system. @@ -233,7 +233,7 @@ -- > $ sed -i 's/\(^package-id \)/--\1/' .ghc.environment.x86_64-linux-$(ghc --numeric-version) -- -- This /sed/ command comments out all lines that start with word /package-id/ --- in file /.ghc.environment.x86_64-linux-9.4.1/ which has been created by the +-- in file /.ghc.environment.x86_64-linux-9.6.2/ which has been created by the -- first command. We will put all needed packages into this file after the next -- step. -- @@ -262,7 +262,7 @@ -- > package-id bytestring-0.11.3.1 -- > package-id ngx-export-1.7.5-17b83e3ac354cc52614227ba662f8c23a8ddd4e08f2a1a02b0d6b51b2dd849ea -- --- will appear at the end of file /.ghc.environment.x86_64-linux-9.4.1/. This +-- will appear at the end of file /.ghc.environment.x86_64-linux-9.6.2/. This -- shall expose the four dependent packages at the next step. -- -- > $ runhaskell --ghc-arg=-package=base --ghc-arg=-package=ngx-export-distribution Setup.hs build --ghc-options="ngx_distribution_test.hs -o ngx_distribution_test.so -threaded" diff --git a/ngx-export-distribution.cabal b/ngx-export-distribution.cabal --- a/ngx-export-distribution.cabal +++ b/ngx-export-distribution.cabal @@ -1,5 +1,5 @@ name: ngx-export-distribution -version: 0.5.0.0 +version: 0.5.0.1 synopsis: Build custom libraries for Nginx haskell module description: Build custom libraries for . diff --git a/nhm-tool.hs b/nhm-tool.hs --- a/nhm-tool.hs +++ b/nhm-tool.hs @@ -77,12 +77,15 @@ when (isNothing section || section == Just HelpDist) $ T.putStrLn $ T.concat ["\n\ \ * nhm-tool dist [-d dir -a ar | -p] [-t target_dir] [-v | -vv] \ - \hslib\n\n\ + \lib\n\n\ + \ collect Haskell libraries on which 'lib' depends,\n\ + \ patch 'lib' to enable loading dependent libraries from \ + \'target_dir'\n\n\ \ 'dir' is a directory where dependent libraries will be\n\ - \ collected (default is", T.pack defaultDistDataDir, ")\n\ + \ collected (default is ", T.pack defaultDistDataDir, ")\n\ \ 'target_dir' is a directory where dependent libraries will be\n\ - \ installed (no default, 'hslib' will not be patched if omitted)\n\ - \ 'ar' is the base name of the archive to contain 'hslib' and\n\ + \ installed (no default, 'lib' will not be patched if omitted)\n\ + \ 'ar' is the base name of the archive to contain 'lib' and\n\ \ 'dir' (no default, the archive will not be created if omitted)\n\ \ if '-p' (patch-only) is specified then dependent libraries will\n\ \ neither be collected nor archived\n\ @@ -93,12 +96,13 @@ when (isNothing section || section == Just HelpDeps) $ T.putStrLn "\n\ \ * nhm-tool deps project-name\n\n\ - \ print all direct dependencies of the given project,\n\ + \ print all direct dependencies of 'project-name',\n\ \ the output is compatible with the format of GHC environment files" when (isNothing section || section == Just HelpInit) $ T.putStrLn $ T.concat ["\n\ \ * nhm-tool init [-p dir] [-no-threaded] [-f | -to-stdout] \ \project-name\n\n\ + \ bootstrap environment to build custom Haskell handlers\n\n\ \ '-p' prefix for install dir, default is ", T.pack defaultInitDataPrefix, "\n\ \ '-no-threaded' use base RTS library\n\