[Pkg-haskell-commits] darcs: haskell-hoogle: Compile haddock_collect.hs

[kiwamu at debian.or.jp]

Wed Sep 12 00:49:47 UTC 2012  kiwamu at debian.or.jp
  * Compile haddock_collect.hs
  Ignore-this: 891d95eae09b28f6ce7613d82c45875a

    M ./control -1 +2
    M ./files_hoogle/update-hoogle -2 +2
    M ./rules -2 +9

Wed Sep 12 00:49:47 UTC 2012  kiwamu at debian.or.jp
  * Compile haddock_collect.hs
  Ignore-this: 891d95eae09b28f6ce7613d82c45875a
diff -rN -u old-haskell-hoogle//control new-haskell-hoogle//control
--- old-haskell-hoogle//control	2012-09-12 00:53:42.350325704 +0000
+++ new-haskell-hoogle//control	2012-09-12 00:53:42.386325214 +0000
@@ -8,6 +8,7 @@
                , cdbs
                , ghc
                , ghc-prof
+               , haskell-platform
                , libghc-blaze-builder-dev (>= 0.2)
                , libghc-blaze-builder-dev (<< 0.4)
                , libghc-blaze-builder-prof
@@ -115,7 +116,7 @@
 Package: hoogle
 Architecture: any
 Section: misc
-Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, ghc | ghc6, haskell-platform
+Depends: ${shlibs:Depends}, ${haskell:Depends}, ${misc:Depends}, ghc-doc
 Recommends: apache2, dwww
 Description: Haskell API Search for Debian system
  Hoogle is a Haskell API search engine, which allows you to
diff -rN -u old-haskell-hoogle//files_hoogle/update-hoogle new-haskell-hoogle//files_hoogle/update-hoogle
--- old-haskell-hoogle//files_hoogle/update-hoogle	2012-09-12 00:53:42.330323971 +0000
+++ new-haskell-hoogle//files_hoogle/update-hoogle	2012-09-12 00:53:42.390324693 +0000
@@ -17,11 +17,11 @@
 
 echo "Collect txt files on ghc-doc"
 find /usr/share/doc/ghc-doc/html/libraries/*/ -name "*.txt*" 2>/dev/null | \
-  /usr/share/hoogle/tool/haddock_collect.hs $URLPREFIX $DATABASE_DIR/
+  haddock_collect $URLPREFIX $DATABASE_DIR/
 
 echo "Collect txt files on libghc-*-doc"
 find /usr/share/doc/libghc-*-doc/html/ -name "*.txt*" 2>/dev/null | \
-  /usr/share/hoogle/tool/haddock_collect.hs $URLPREFIX $DATABASE_DIR/
+  haddock_collect $URLPREFIX $DATABASE_DIR/
 
 # convert
 for i in $DATABASE_DIR/*.txt; do
diff -rN -u old-haskell-hoogle//rules new-haskell-hoogle//rules
--- old-haskell-hoogle//rules	2012-09-12 00:53:42.326325085 +0000
+++ new-haskell-hoogle//rules	2012-09-12 00:53:42.402325162 +0000
@@ -4,10 +4,17 @@
 
 DEB_SETUP_GHC_CONFIGURE_ARGS := --datasubdir=/usr/share/hoogle
 HOOGLE_RESDIR := debian/hoogle/usr/share/hoogle/resources
+FILES_HOOGLE := debian/files_hoogle
 
 build/hoogle:: build-ghc-stamp
+	cd $(FILES_HOOGLE)/ && ghc -Wall -O haddock_collect.hs
+	cd $(FILES_HOOGLE)/ && strip haddock_collect
+
 binary-fixup/hoogle::
 	sed -i -e "s/res\//\/hoogle\//g" $(HOOGLE_RESDIR)/template.html
 	sed -i -e "s/action=\"\.\"/action=\"\.\/hoogle\"/g" $(HOOGLE_RESDIR)/template.html
-	install debian/files_hoogle/update-hoogle debian/hoogle/usr/sbin/
-	install debian/files_hoogle/haddock_collect.hs debian/hoogle/usr/share/hoogle/tool/
+	install $(FILES_HOOGLE)/update-hoogle debian/hoogle/usr/sbin/
+	install $(FILES_HOOGLE)/haddock_collect debian/hoogle/usr/sbin/
+
+clean::
+	cd $(FILES_HOOGLE)/ && rm -f haddock_collect haddock_collect.hi haddock_collect.o