Skip to content

Commit

Permalink
Cleaned up the "uulib" repository. It didn't build anymore
Browse files Browse the repository at this point in the history
with GHC 7.2.

* 'pure' cabal: no autoconf, configure and makefiles anymore.
  The only purpose of configure was to generate files with
  a version number in it. Nowadays cabal actually generated
  a Haskell module with the version number in it, thus we
  can simply use the version number in the .cabal file.

* removed the dependency on the 'haskell98' package.
  This package causes problems with ghc-7.2 due to
  a duplicate Prelude module. The haskell98 package is only
  there to provide backwards compatibility with packages that
  don't use the hierarchical libraries... which they should.
  So, I updated the imports in the sources
  to the appropriate modules.

* updated the license-stuff. Daan's code Map-code is already
  not part anymore of the uulib package for a while, so the
  information that his code was released under the LGPL
  can go away, and thus I updated the license field to
  BSD3.

* Question: is the -O0 flag to GHC truly necessary?
  If some option is hurting performance, perhaps there is a
  more specific compiler flag with the same effect?
  Or: maybe it is better specified with an
  {-# OPTIONS_GHC -O0 #-} flag in the problematic
  Haskell modules, so that optimizations will be enabled
  for the others (e.g. the pretty printing).
  • Loading branch information
ariem committed Aug 11, 2011
1 parent 171eb06 commit 33733a4
Show file tree
Hide file tree
Showing 16 changed files with 146 additions and 1,014 deletions.
62 changes: 0 additions & 62 deletions COPYRIGHT

This file was deleted.

23 changes: 23 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of the Universiteit Utrecht nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL UNIVERSITEIT UTRECHT BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
507 changes: 0 additions & 507 deletions LICENSE-LGPL

This file was deleted.

115 changes: 0 additions & 115 deletions Makefile.in

This file was deleted.

83 changes: 2 additions & 81 deletions README
Original file line number Diff line number Diff line change
@@ -1,81 +1,2 @@
Please check the right section in this file for instructions depending on how you obtained the source files.


Installing uulib from a source distribution
-------------------------------------------

The source distribution can be unpacked from the
.tar.gz files distributed in the following page:

http://www.cs.uu.nl/wiki/HUT/Download

System wide installation (assumming GHC is the
Haskell compiler) can be done like this:

ghc --make Setup.hs -o setup -package Cabal
./setup configure
./setup build
./setup install


Installing uulib to a non-standard location
-------------------------------------------

This is useful if you don't want (or can't)
modify system wide settings.

ghc --make Setup.hs -o setup -package Cabal
./setup configure --prefix=/foo
./setup build
./setup install --user

The last command registers the package only for
the user.


Installing uulib from the subversion repository
-----------------------------------------------

Which can be obtained running the following subversion command:

svn co https://svn.cs.uu.nl:12443/repos/uust-repo/uulib/trunk/

Now install following the instructions below:

autoconf
./configure

NOTE: the above instructions are REQUIRED when you install from the
subversion repository. They are not needed when you download a
source distribution.

This generates uulib.cabal which is needed for the cabal commands:

ghc --make Setup.hs -o setup -package Cabal
./setup configure
./setup build
./setup install

If you want to install to a non-standard location
you don't need to pass a path to configure, just follow
the steps outlined above.

Source tarball (uploadable to hackage)
--------------------------------------

Use the "sdist" cabal command:

ghc --make Setup.hs -o setup -package Cabal
./setup configure
./setup sdist

You will find the tarball in the dist directory.

Optionally generating Haddock Documentation
-------------------------------------------

Requires cpphs 0.9
Output generated in dist/doc/html

./setup haddock

This is a conventional cabal package and can be
installed accordingly.
4 changes: 2 additions & 2 deletions Setup.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

module Main where
import Distribution.Simple
main = defaultMain
main = defaultMain
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

6 changes: 3 additions & 3 deletions benchmark/src/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ touch (x:xs) = seq x (touch xs)

getResult :: Parser Char a -> String -> IO a
getResult p str =
return $ unpack $ evalSteps $ parse p str where unpack (Pair v _) = v
-- parseIO p str
-- return $ unpack $ evalSteps $ parse p str where unpack (Pair v _) = v
parseIO p str

sizes :: [Int]
sizes = [20,50,100,400,800,1000,1500,2000,3000]
sizes = [1000]

main :: IO ()
main = defaultMain $ bgroup "uulib" $ map (uncurry bench) $ map mkBench sizes
47 changes: 0 additions & 47 deletions configure.in

This file was deleted.

Loading

0 comments on commit 33733a4

Please sign in to comment.