[Git][ghc/ghc][ghc-9.2] 2 commits: Revert "Fix gen_contents_index logic for hadrian bindist"

[Zubin (@wz1000)]

Zubin pushed to branch ghc-9.2 at Glasgow Haskell Compiler / GHC


Commits:
78682c42 by Zubin Duggal at 2023-02-24T18:35:32+05:30
Revert "Fix gen_contents_index logic for hadrian bindist"

This reverts commit f73a38069b622462df9cc03a4f2195b93a98f80b.

- - - - -
b81cd709 by Zubin Duggal at 2023-02-24T18:37:46+05:30
release notes: remove line about fix for #22431 after reverting f73a38069b622462df9cc03a4f2195b93a98f80b.

- - - - -


5 changed files:

- distrib/mkDocs/mkDocs
- docs/users_guide/9.2.7-notes.rst
- hadrian/bindist/Makefile
- hadrian/src/Rules/BinaryDist.hs
- libraries/gen_contents_index


Changes:

=====================================
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


=====================================
docs/users_guide/9.2.7-notes.rst
=====================================
@@ -45,10 +45,6 @@ Build system and packaging
 - Remove quarantine attribute when installing binary distribution on MacOS
   (:ghc-ticket:`21506`, :ghc-ticket:`23009`).
 
-- Include the ``gen_contents_index`` script which generates an index page
-  for GHC and library documentation in binary distributions generated by
-  Hadrian (:ghc-ticket:`22431`).
-
 - Enable SMP on powerp64{le} (:ghc-ticket:`19825`).
 
 Included libraries


=====================================
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"


=====================================
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


=====================================
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"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/aedae566cf988e99bc3f630f57a8177c24572102...b81cd709df8054b8b98ac05d3b9affcee9a8b840

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/aedae566cf988e99bc3f630f57a8177c24572102...b81cd709df8054b8b98ac05d3b9affcee9a8b840
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230224/b7dfa668/attachment-0001.html>