From 8e299f5b5d2322d5d6381f0723243f096dd07d5c Mon Sep 17 00:00:00 2001 From: PHO Date: Sun, 22 Aug 2010 15:13:29 +0900 Subject: [PATCH] initial revision --- .gitignore | 5 ++ Bindings/APR/AnyLock.hsc | 32 +++++++++++++ COPYING | 29 ++++++++++++ GNUmakefile | 5 ++ Setup.hs | 4 ++ bindings-apr-util.cabal | 38 +++++++++++++++ cabal-package.mk | 95 ++++++++++++++++++++++++++++++++++++++ cbits/helper_apr_anylock.c | 6 +++ 8 files changed, 214 insertions(+) create mode 100644 .gitignore create mode 100644 Bindings/APR/AnyLock.hsc create mode 100644 COPYING create mode 100644 GNUmakefile create mode 100644 Setup.hs create mode 100644 bindings-apr-util.cabal create mode 100644 cabal-package.mk create mode 100644 cbits/helper_apr_anylock.c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f76a6e2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.hi +*.o + +Setup +dist diff --git a/Bindings/APR/AnyLock.hsc b/Bindings/APR/AnyLock.hsc new file mode 100644 index 0000000..acfc483 --- /dev/null +++ b/Bindings/APR/AnyLock.hsc @@ -0,0 +1,32 @@ +#include +#include + +module Bindings.APR.AnyLock where +#strict_import +import Bindings.APR.ErrNo +import Bindings.APR.Proc.Mutex +import Bindings.APR.Thread.Mutex +import Bindings.APR.Thread.RWLock + +#synonym_t tm_lock, CInt +#num apr_anylock_none +#num apr_anylock_procmutex +#num apr_anylock_readlock +#num apr_anylock_writelock + +#starttype union apr_anylock_u_t +# union_field pm, Ptr +# if APR_HAS_THREADS +# union_field tm, Ptr +# union_field rw, Ptr +# endif +#stoptype + +#starttype struct apr_anylock_t +#field type, +#field lock, +#stoptype + +#cinline APR_ANYLOCK_LOCK , Ptr -> IO +#cinline APR_ANYLOCK_TRYLOCK, Ptr -> IO +#cinline APR_ANYLOCK_UNLOCK , Ptr -> IO diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..b25a323 --- /dev/null +++ b/COPYING @@ -0,0 +1,29 @@ + + + + + bindings-apr-util + + + PHO + + + + + + + + + + + + diff --git a/GNUmakefile b/GNUmakefile new file mode 100644 index 0000000..15098cd --- /dev/null +++ b/GNUmakefile @@ -0,0 +1,5 @@ +#RUN_COMMAND = $(MAKE) -C examples run + +CONFIGURE_ARGS = -O + +include cabal-package.mk diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 0000000..bd92fff --- /dev/null +++ b/Setup.hs @@ -0,0 +1,4 @@ +#!/usr/bin/env runghc + +import Distribution.Simple +main = defaultMain diff --git a/bindings-apr-util.cabal b/bindings-apr-util.cabal new file mode 100644 index 0000000..7378386 --- /dev/null +++ b/bindings-apr-util.cabal @@ -0,0 +1,38 @@ +Name: bindings-apr-util +Synopsis: Low level bindings to Apache Portable Runtime Utility (APR Utility) +Description: + Bindings to APR Utility: +Version: 0.1 +License: PublicDomain +License-File: COPYING +Author: PHO +Maintainer: PHO +Stability: experimental +Homepage: http://cielonegro.org/Bindings-APR.html +Category: FFI +Tested-With: GHC == 6.12.3 +Cabal-Version: >= 1.6 +Build-Type: Simple +Extra-Source-Files: + +Source-Repository head + Type: git + Location: git://git.cielonegro.org/bindings-apr-util.git + +Library + Build-Depends: + base == 4.2.*, + bindings-DSL == 1.0.*, + bindings-apr == 0.1.* + + PkgConfig-Depends: + apr-util-1 >= 1.3 + + Exposed-Modules: + Bindings.APR.AnyLock + + C-Sources: + cbits/helper_apr_anylock.c + + Extensions: + ForeignFunctionInterface diff --git a/cabal-package.mk b/cabal-package.mk new file mode 100644 index 0000000..d8bbaad --- /dev/null +++ b/cabal-package.mk @@ -0,0 +1,95 @@ +# -*- makefile-gmake -*- +# +# Variables: +# +# CONFIGURE_ARGS :: arguments to be passed to ./Setup configure +# default: --disable-optimization +# +# RUN_COMMAND :: command to be run for "make run" +# + +GHC ?= ghc +FIND ?= find +RM_RF ?= rm -rf +SUDO ?= sudo +AUTOCONF ?= autoconf +HLINT ?= hlint + +CONFIGURE_ARGS ?= --disable-optimization + +SETUP_FILE := $(wildcard Setup.*hs) +CABAL_FILE := $(wildcard *.cabal) + +ifeq ($(shell ls configure.ac 2>/dev/null),configure.ac) + AUTOCONF_AC_FILE := configure.ac + AUTOCONF_FILE := configure +else + ifeq ($(shell ls configure.in 2>/dev/null),configure.in) + AUTOCONF_AC_FILE := configure.in + AUTOCONF_FILE := configure + else + AUTOCONF_AC_FILE := + AUTOCONF_FILE := + endif +endif + +BUILDINFO_IN_FILE := $(wildcard *.buildinfo.in) +BUILDINFO_FILE := $(BUILDINFO_IN_FILE:.in=) + +all: build + +build: setup-config build-hook + ./Setup build + +build-hook: + +ifeq ($(RUN_COMMAND),) +run: + @echo "cabal-package.mk: No command to run." + @echo "cabal-package.mk: If you want to run something, define RUN_COMMAND variable." +else +run: build + @echo ".:.:. Let's go .:.:." + $(RUN_COMMAND) +endif + +setup-config: dist/setup-config setup-config-hook $(BUILDINFO_FILE) + +setup-config-hook: + +dist/setup-config: $(CABAL_FILE) Setup $(AUTOCONF_FILE) + ./Setup configure $(CONFIGURE_ARGS) + +$(AUTOCONF_FILE): $(AUTOCONF_AC_FILE) + $(AUTOCONF) + +$(BUILDINFO_FILE): $(BUILDINFO_IN_FILE) configure + ./Setup configure $(CONFIGURE_ARGS) + +Setup: $(SETUP_FILE) + $(GHC) --make Setup + +clean: clean-hook + $(RM_RF) dist Setup *.o *.hi .setup-config *.buildinfo + $(FIND) . -name '*~' -exec rm -f {} \; + +clean-hook: + +doc: setup-config + ./Setup haddock + +install: build + $(SUDO) ./Setup install + +sdist: setup-config + ./Setup sdist + +test: build + ./Setup test + +lint: + $(HLINT) . --report \ + --ignore="Use string literal" \ + --ignore="Use concatMap" + +.PHONY: build build-hook setup-config setup-config-hook run clean clean-hook install doc sdist test lint diff --git a/cbits/helper_apr_anylock.c b/cbits/helper_apr_anylock.c new file mode 100644 index 0000000..a874008 --- /dev/null +++ b/cbits/helper_apr_anylock.c @@ -0,0 +1,6 @@ +#include +#include + +BC_INLINE1(APR_ANYLOCK_LOCK , apr_anylock_t*, apr_status_t) +BC_INLINE1(APR_ANYLOCK_TRYLOCK, apr_anylock_t*, apr_status_t) +BC_INLINE1(APR_ANYLOCK_UNLOCK , apr_anylock_t*, apr_status_t) -- 2.40.0