diff options
| author | Zubin Duggal <zubin.duggal@gmail.com> | 2023-02-24 18:35:32 +0530 |
|---|---|---|
| committer | Zubin Duggal <zubin.duggal@gmail.com> | 2023-02-24 18:35:32 +0530 |
| commit | 78682c4273b5907b6fdba581b0eb1e93488457fb (patch) | |
| tree | 3fe91dc45e7c383b9da8b0da59acb3bb1bd39f1c | |
| parent | aedae566cf988e99bc3f630f57a8177c24572102 (diff) | |
| download | haskell-78682c4273b5907b6fdba581b0eb1e93488457fb.tar.gz | |
Revert "Fix gen_contents_index logic for hadrian bindist"
This reverts commit f73a38069b622462df9cc03a4f2195b93a98f80b.
| -rwxr-xr-x | distrib/mkDocs/mkDocs | 11 | ||||
| -rw-r--r-- | hadrian/bindist/Makefile | 3 | ||||
| -rw-r--r-- | hadrian/src/Rules/BinaryDist.hs | 3 | ||||
| -rw-r--r-- | libraries/gen_contents_index | 13 |
4 files changed, 4 insertions, 26 deletions
diff --git a/distrib/mkDocs/mkDocs b/distrib/mkDocs/mkDocs index b11c9dde78..641d945cfa 100755 --- a/distrib/mkDocs/mkDocs +++ b/distrib/mkDocs/mkDocs @@ -40,18 +40,13 @@ mv ../../../../../../windows/doc/html/libraries/Win32-* . || \ sh gen_contents_index cd .. -for i in */ +for i in haddock libraries users_guide do - dir=${i%*/} - tar -Jcf ../../../../../$dir.html.tar.xz $dir + tar -Jcf ../../../../../$i.html.tar.xz $i done mv index.html ../../../../.. cd .. -# make -mv ./*.pdf ../../../.. || \ -# hadrian - mv ./pdfs/*.pdf ../../../.. || \ - die "failed to find PDFs" +mv ./*.pdf ../../../.. cd ../../../.. [ "$NO_CLEAN" -eq 0 ] && rm -r inst [ "$NO_CLEAN" -eq 0 ] && rm -r windows diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index e4081a19a5..679952a391 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -203,9 +203,6 @@ install_docs: cp -R $$i "$(DESTDIR)$(docdir)/"; \ done - $(INSTALL_DATA) docs-utils/prologue.txt "$(docdir)/html/libraries/" - $(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(docdir)/html/libraries/" - BINARY_NAMES=$(shell ls ./wrappers/) install_wrappers: install_bin_libdir @echo "Installing wrapper scripts" diff --git a/hadrian/src/Rules/BinaryDist.hs b/hadrian/src/Rules/BinaryDist.hs index 118cd33d71..1a83bb7480 100644 --- a/hadrian/src/Rules/BinaryDist.hs +++ b/hadrian/src/Rules/BinaryDist.hs @@ -227,9 +227,6 @@ bindistRules = do -- included in the bindist in the past (part of the problem in #18669). whenM (liftIO (IO.doesDirectoryExist (root -/- "docs"))) $ do copyDirectory (root -/- "docs") bindistFilesDir - copyFile ("libraries" -/- "prologue.txt") (bindistFilesDir -/- "docs-utils" -/- "prologue.txt") - copyFile ("libraries" -/- "gen_contents_index") (bindistFilesDir -/- "docs-utils" -/- "gen_contents_index" ) - when windowsHost $ do copyDirectory (root -/- "mingw") bindistFilesDir -- we use that opportunity to delete the .stamp file that we use diff --git a/libraries/gen_contents_index b/libraries/gen_contents_index index 1efd5eb157..29be2e13f9 100644 --- a/libraries/gen_contents_index +++ b/libraries/gen_contents_index @@ -32,18 +32,7 @@ then [ -d dist-haddock ] || mkdir dist-haddock cd dist-haddock - if [ -e ../../inplace/bin/haddock ] - then - # Make #17527 - HADDOCK=../../inplace/bin/haddock - elif [ -e ../../../../../bin/haddock ] - then - # Hadrian - HADDOCK=../../../../../bin/haddock - else - echo "Haddock not found" - exit 1 - fi + HADDOCK=../../inplace/bin/haddock # Exclude Cabal package-tests, which may run haddock HADDOCK_FILES=`find ../ -name *.haddock | grep -v 'PackageTests' | sort` HADDOCK_ARGS="-p ../prologue.txt" |