incubator-triplesoup-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@apache.org
Subject svn commit: r527078 - in /incubator/triplesoup/code/trunk: ./ build/ include/ libraries/ libraries/b/ modules/ modules/sparql/
Date Tue, 10 Apr 2007 10:04:20 GMT
Author: dreid
Date: Tue Apr 10 03:04:16 2007
New Revision: 527078

URL: http://svn.apache.org/viewvc?view=rev&rev=527078
Log:
This is a very initial pass at adding some build logic and some
code from the donations to TripleSoup. This has been developed on
Ubuntu, so it should work on Linux systems, but work will be needed
to get it working on other systems. I make no apologies for this :-)

This doesn't bring in all the code from the libb donation, nor
does it attempt to correct the various copyright notices - an exrecise
left for Leo as he volunteered to handle that :-)

The configure detection routines are a little primitive, as is the
entire build process, but it gets us moving and building. I'm sure
many of you will have improvements you can throw at it! Please do
so :-)

We should look to add the tests for libb and also integrate the
testing code Leo had already committed into the build, but as I
didn't grok what was required I left it as an exercise for the reader.

Enjoy!

Added:
    incubator/triplesoup/code/trunk/build/   (with props)
    incubator/triplesoup/code/trunk/build/PrintPath   (with props)
    incubator/triplesoup/code/trunk/build/apache2.m4
    incubator/triplesoup/code/trunk/build/buildcheck.sh   (with props)
    incubator/triplesoup/code/trunk/build/redland.m4
    incubator/triplesoup/code/trunk/build/rules.mk.in
    incubator/triplesoup/code/trunk/buildconf   (with props)
    incubator/triplesoup/code/trunk/configure.ac
    incubator/triplesoup/code/trunk/include/   (with props)
    incubator/triplesoup/code/trunk/include/config.h.in
    incubator/triplesoup/code/trunk/install-sh   (with props)
    incubator/triplesoup/code/trunk/libraries/
    incubator/triplesoup/code/trunk/libraries/Makefile
    incubator/triplesoup/code/trunk/libraries/b/   (with props)
    incubator/triplesoup/code/trunk/libraries/b/Makefile.in
    incubator/triplesoup/code/trunk/libraries/b/b.h
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/b.h
    incubator/triplesoup/code/trunk/libraries/b/b_internal.h
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/b_internal.h
    incubator/triplesoup/code/trunk/libraries/b/badd.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/badd.c
    incubator/triplesoup/code/trunk/libraries/b/bcache.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bcache.c
    incubator/triplesoup/code/trunk/libraries/b/bcount.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bcount.c
    incubator/triplesoup/code/trunk/libraries/b/bdestroy.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bdestroy.c
    incubator/triplesoup/code/trunk/libraries/b/berror.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/berror.c
    incubator/triplesoup/code/trunk/libraries/b/bget.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bget.c
    incubator/triplesoup/code/trunk/libraries/b/bhash.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bhash.c
    incubator/triplesoup/code/trunk/libraries/b/bio.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bio.c
    incubator/triplesoup/code/trunk/libraries/b/biterator.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/biterator.c
    incubator/triplesoup/code/trunk/libraries/b/bmd5.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bmd5.c
    incubator/triplesoup/code/trunk/libraries/b/bnew.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bnew.c
    incubator/triplesoup/code/trunk/libraries/b/bremove.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bremove.c
    incubator/triplesoup/code/trunk/libraries/b/bstring.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bstring.c
    incubator/triplesoup/code/trunk/libraries/b/bsync.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/bsync.c
    incubator/triplesoup/code/trunk/libraries/b/btcache.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/btcache.c
    incubator/triplesoup/code/trunk/libraries/b/btempty.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/btempty.c
    incubator/triplesoup/code/trunk/libraries/b/btimer.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/btimer.c
    incubator/triplesoup/code/trunk/libraries/b/btriple.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-2-libb/src/btriple.c
    incubator/triplesoup/code/trunk/modules/Makefile
    incubator/triplesoup/code/trunk/modules/sparql/   (with props)
    incubator/triplesoup/code/trunk/modules/sparql/Makefile.in
    incubator/triplesoup/code/trunk/modules/sparql/mod_sparql.c
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-1-mod_sparql/mod_sparql.c
    incubator/triplesoup/code/trunk/modules/sparql/mod_sparql.h
      - copied unchanged from r527064, incubator/triplesoup/donations/TRIPLES-1-mod_sparql/mod_sparql.h
Modified:
    incubator/triplesoup/code/trunk/   (props changed)
    incubator/triplesoup/code/trunk/Makefile

Propchange: incubator/triplesoup/code/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr 10 03:04:16 2007
@@ -1,2 +1,6 @@
 triplesoup-r*
 releaseme
+config.*
+configure
+autom4te.*
+

Modified: incubator/triplesoup/code/trunk/Makefile
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/Makefile?view=diff&rev=527078&r1=527077&r2=527078
==============================================================================
--- incubator/triplesoup/code/trunk/Makefile (original)
+++ incubator/triplesoup/code/trunk/Makefile Tue Apr 10 03:04:16 2007
@@ -1,3 +1,17 @@
+DIRS=libraries modules
+
+all:	
+	@for d in $(DIRS); do                                          \
+		echo "Building in $$d";                                \
+		(cd $$d && make --no-print-directory) || exit 1;       \
+	done
+
+clean:
+	@for d in $(DIRS); do                                          \
+		echo "Cleaning in $$d";                                \
+		(cd $$d && make clean --no-print-directory) || exit 1; \
+	done
+
 release:
 	echo '#!/usr/bin/env bash' > 'releaseme'
 	./release.sh >> 'releaseme'

Propchange: incubator/triplesoup/code/trunk/build/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 10 03:04:16 2007
@@ -0,0 +1,2 @@
+rules.mk
+

Added: incubator/triplesoup/code/trunk/build/PrintPath
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/PrintPath?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/build/PrintPath (added)
+++ incubator/triplesoup/code/trunk/build/PrintPath Tue Apr 10 03:04:16 2007
@@ -0,0 +1,130 @@
+#!/bin/sh
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+# Look for program[s] somewhere in $PATH.
+#
+# Options:
+#  -s
+#    Do not print out full pathname. (silent)
+#  -pPATHNAME
+#    Look in PATHNAME instead of $PATH
+#
+# Usage:
+#  PrintPath [-s] [-pPATHNAME] program [program ...]
+#
+# Initially written by Jim Jagielski for the Apache configuration mechanism
+#  (with kudos to Kernighan/Pike)
+
+##
+# Some "constants"
+##
+pathname=$PATH
+echo="yes"
+
+##
+# Find out what OS we are running for later on
+##
+os=`(uname) 2>/dev/null`
+
+##
+# Parse command line
+##
+for args in $*
+do
+    case $args in
+	-s  ) echo="no" ;;
+	-p* ) pathname="`echo $args | sed 's/^..//'`" ;;
+	*   ) programs="$programs $args" ;;
+    esac
+done
+
+##
+# Now we make the adjustments required for OS/2 and everyone
+# else :)
+#
+# First of all, all OS/2 programs have the '.exe' extension.
+# Next, we adjust PATH (or what was given to us as PATH) to
+# be whitespace separated directories.
+# Finally, we try to determine the best flag to use for
+# test/[] to look for an executable file. OS/2 just has '-r'
+# but with other OSs, we do some funny stuff to check to see
+# if test/[] knows about -x, which is the prefered flag.
+##
+
+if [ "x$os" = "xOS/2" ]
+then
+    ext=".exe"
+    pathname=`echo -E $pathname |
+     sed 's/^;/.;/
+	  s/;;/;.;/g
+	  s/;$/;./
+	  s/;/ /g
+	  s/\\\\/\\//g' `
+    test_exec_flag="-r"
+else
+    ext=""	# No default extensions
+    pathname=`echo $pathname |
+     sed 's/^:/.:/
+	  s/::/:.:/g
+	  s/:$/:./
+	  s/:/ /g' `
+    # Here is how we test to see if test/[] can handle -x
+    testfile="pp.t.$$"
+
+    cat > $testfile <<ENDTEST
+#!/bin/sh
+if [ -x / ] || [ -x /bin ] || [ -x /bin/ls ]; then
+    exit 0
+fi
+exit 1
+ENDTEST
+
+    if `/bin/sh $testfile 2>/dev/null`; then
+	test_exec_flag="-x"
+    else
+	test_exec_flag="-r"
+    fi
+    rm -f $testfile
+fi
+
+for program in $programs
+do
+    for path in $pathname
+    do
+	if [ $test_exec_flag $path/${program}${ext} ] && \
+	   [ ! -d $path/${program}${ext} ]; then
+	    if [ "x$echo" = "xyes" ]; then
+		echo $path/${program}${ext}
+	    fi
+	    exit 0
+	fi
+
+# Next try without extension (if one was used above)
+	if [ "x$ext" != "x" ]; then
+            if [ $test_exec_flag $path/${program} ] && \
+               [ ! -d $path/${program} ]; then
+                if [ "x$echo" = "xyes" ]; then
+                    echo $path/${program}
+                fi
+                exit 0
+            fi
+        fi
+    done
+done
+exit 1
+

Propchange: incubator/triplesoup/code/trunk/build/PrintPath
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/triplesoup/code/trunk/build/apache2.m4
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/apache2.m4?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/build/apache2.m4 (added)
+++ incubator/triplesoup/code/trunk/build/apache2.m4 Tue Apr 10 03:04:16 2007
@@ -0,0 +1,50 @@
+dnl
+dnl TS_CHECK_APACHE2()
+dnl
+AC_DEFUN([TS_CHECK_APACHE2],[
+  AC_MSG_RESULT(Checking for Apache 2.x)
+
+  AC_ARG_WITH(apxs,
+    [  --with-apxs             Specify location of apache 2 apxs] ,
+    [  CFG_=$withval ]
+  )
+
+  if test "x$CFG_" = "x"; then
+    apxs_places="/usr/local/apache2"
+    for d in $apxs_places; do
+      if test -d $d && test -d $d/bin; then 
+        TS_CHECK_APXS(["$d/bin/apxs"], [APXS])
+
+        if test "x$APXS" != "x"; then
+          break
+        fi
+      fi
+    done
+  else
+    AC_MSG_RESULT([Checking for apache 2 apxs in supplied path])
+    TS_CHECK_APXS(["$RDCFG_/bin/apxs"], [APXS])
+  fi
+
+  if test "x$APXS" = "x"; then
+    AC_MSG_RESULT([Unable to find apache 2 apxs])
+    AC_MSG_ERROR([Aborting])
+  fi
+  AC_SUBST(APXS)
+])
+
+
+AC_DEFUN([TS_CHECK_APXS],[
+  AC_MSG_CHECKING([for $1])
+  apxs=$1
+  if test -e $apxs; then
+    check="`$apxs 2>&1`"
+    if test "$?" != "0" && test -x $apxs; then
+      $2=$apxs
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+  else
+    AC_MSG_RESULT([not found])
+  fi
+])

Added: incubator/triplesoup/code/trunk/build/buildcheck.sh
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/buildcheck.sh?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/build/buildcheck.sh (added)
+++ incubator/triplesoup/code/trunk/build/buildcheck.sh Tue Apr 10 03:04:16 2007
@@ -0,0 +1,35 @@
+#! /bin/sh
+
+echo "buildconf: checking installation..."
+
+# any python
+python=`build/PrintPath python`
+if test -z "$python"; then
+echo "buildconf: python not found."
+echo "           You need python installed"
+echo "           to build APR from SVN."
+exit 1
+else
+py_version=`python -c 'import sys; print sys.version' 2>&1|sed 's/ .*//;q'`
+echo "buildconf: python version $py_version (ok)"
+fi
+
+# autoconf 2.50 or newer
+ac_version=`${AUTOCONF:-autoconf} --version 2>/dev/null|sed -e 's/^[^0-9]*//;s/[a-z]*
*$//;q'`
+if test -z "$ac_version"; then
+echo "buildconf: autoconf not found."
+echo "           You need autoconf version 2.50 or newer installed"
+echo "           to build APR from SVN."
+exit 1
+fi
+IFS=.; set $ac_version; IFS=' '
+if test "$1" = "2" -a "$2" -lt "50" || test "$1" -lt "2"; then
+echo "buildconf: autoconf version $ac_version found."
+echo "           You need autoconf version 2.50 or newer installed"
+echo "           to build APR from SVN."
+exit 1
+else
+echo "buildconf: autoconf version $ac_version (ok)"
+fi
+
+exit 0

Propchange: incubator/triplesoup/code/trunk/build/buildcheck.sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/triplesoup/code/trunk/build/redland.m4
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/redland.m4?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/build/redland.m4 (added)
+++ incubator/triplesoup/code/trunk/build/redland.m4 Tue Apr 10 03:04:16 2007
@@ -0,0 +1,53 @@
+dnl
+dnl TS_CHECK_REDLAND()
+dnl
+AC_DEFUN([TS_CHECK_REDLAND],[
+  AC_MSG_RESULT(Checking for Redland 1.0.x)
+
+  AC_ARG_WITH(redland-config,
+    [  --with-redland-config   Specify location of redland-config] ,
+    [  RDCFG_=$withval ]
+  )
+
+  if test "x$RDCFG_" = "x"; then
+    redland_places="/usr/local /usr"
+    for d in $redland_places; do
+      if test -d $d && test -d $d/bin; then 
+        TS_CHECK_REDLAND_CONFIG(["$d/bin/redland-config"], [REDLAND])
+
+        if test "x$REDLAND" != "x"; then
+          break
+        fi
+      fi
+    done
+  else
+    AC_MSG_RESULT([Checking for redland-config in supplied path])
+    TS_CHECK_REDLAND_CONFIG(["$RDCFG_/bin/redland-config"], [REDLAND])
+  fi
+
+  if test "x$REDLAND" = "x"; then
+    AC_MSG_RESULT([Unable to find redland config script])
+    AC_MSG_ERROR([Aborting])
+  fi
+  REDLAND_CFLAGS="`$REDLAND --cflags`"
+  REDLAND_LDFLAGS="`$REDLAND --libs`"
+  AC_SUBST(REDLAND_CFLAGS)
+  AC_SUBST(REDLAND_LDFLAGS)
+])
+
+
+AC_DEFUN([TS_CHECK_REDLAND_CONFIG],[
+  AC_MSG_CHECKING([for $1])
+  redland_test=$1
+  if test -e $redland_test; then
+    version="`$redland_test --version`"
+    if test "$?" = "0" && test -x $redland_test; then
+      $2=$redland_test
+      AC_MSG_RESULT([yes, $version])
+    else
+      AC_MSG_RESULT([no])
+    fi
+  else
+    AC_MSG_RESULT([not found])
+  fi
+])

Added: incubator/triplesoup/code/trunk/build/rules.mk.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/build/rules.mk.in?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/build/rules.mk.in (added)
+++ incubator/triplesoup/code/trunk/build/rules.mk.in Tue Apr 10 03:04:16 2007
@@ -0,0 +1,47 @@
+# TripleSoup build settings file
+#
+# This file is generated by configure and should not be edited!
+# If you need to make changes, run configure with the options you
+# need/want.
+#
+# This file is included by the various makefiles
+#
+
+TOPDIR=@top_srcdir@
+
+# paths from various libraries we rely on
+REDLAND_CFLAGS=@REDLAND_CFLAGS@
+REDLAND_LDFLAGS=@REDLAND_LDFLAGS@
+
+# programs we use
+APXS=@APXS@
+
+# settings that configure figures out
+A_EXT=@A_EXT@
+CFLAGS=@CFLAGS@ @CPPFLAGS@
+INCLUDES=-I. -I$(TOPDIR)/include
+LDFLAGS=@LDFLAGS@
+PICFLAGS=@PICFLAGS@
+SO_EXT=@SO_EXT@
+SO_FLAGS=@SO_FLAGS@
+
+# This line is as far as configure needs to touch - below it we simply
+# use the options defined above for our nefarious means.
+
+MAKE_STATIC=@$(AR) $(ARFLAGS) lib$(MODULE).$(A_EXT) $(OBJS) && \
+	echo "\t\tStatic library lib$(MODULE).$(A_EXT) created"
+MAKE_SHARED=@$(CC) $(SO_FLAGS) -o lib$(MODULE).$(SO_EXT) \
+	$(LOBJS) $(LDFLAGS) && \
+	echo "\t\tShared library lib$(MODULE).$(SO_EXT) created"
+
+# Rules
+#
+# Static object creation
+.c.o:
+	@$(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) \
+	      -c $< -o $@ && echo "\t\tCreated object $@"
+
+.c.lo:
+	@$(CC) $(CFLAGS) $(PICFLAGS) $(INCLUDES) $(DEFINES) \
+	      -c $< -o $@ && echo "\t\tCreated shared object $@"
+

Added: incubator/triplesoup/code/trunk/buildconf
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/buildconf?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/buildconf (added)
+++ incubator/triplesoup/code/trunk/buildconf Tue Apr 10 03:04:16 2007
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Copyright 1999-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# This script runs all the required commands to create a configure script.
+# Once completed, configure should be run. To view the options available
+# run "./configure --help".
+#
+
+# Check we have the required apps installed to build from SVN.
+build/buildcheck.sh || (echo "Error"; exit 1)
+
+config_h_in="include/config.h.in"
+
+echo "Creating $config_h_in ..."
+${AUTOHEADER:-autoheader} 2>&1 | grep -v "$cross_compile_warning"
+
+echo "Creating configure ..."
+rm -f config.cache
+${AUTOCONF:-autoconf} 2>&1 | grep -v "$cross_compile_warning"
+
+# Remove autoconf 2.5x cache directories
+rm -rf autom4te*.cache

Propchange: incubator/triplesoup/code/trunk/buildconf
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/triplesoup/code/trunk/configure.ac
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/configure.ac?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/configure.ac (added)
+++ incubator/triplesoup/code/trunk/configure.ac Tue Apr 10 03:04:16 2007
@@ -0,0 +1,66 @@
+# configure.ac
+#
+# This file is processed by autoconf to generate a configure script.
+# the configure script is then used to configure the build.
+#
+AC_INIT([TripleSoup], [0.0.1])
+AC_CONFIG_HEADER([include/config.h])
+AM_INIT_AUTOMAKE
+
+# dnl include our homebrew scripts
+sinclude(build/apache2.m4)
+sinclude(build/redland.m4)
+
+srcdir=`pwd`
+topdir=`pwd`
+
+# Defaults that some systems will need to override
+A_EXT=a
+ARFLAGS="-ar"
+CFLAGS="-Wall -O2"
+PICFLAGS="-fPIC -DPIC"
+SO_EXT=so
+SO_FLAGS=-shared
+
+AC_ARG_WITH(cflags,
+        [  --with-cflags           Specify additional flags to pass to preprocessor] ,
+        [
+                if test "x$withval" != "xno"; then
+                        CFLAGS="$CFLAGS $withval"
+                fi
+        ]
+)
+AC_ARG_WITH(cppflags,
+        [  --with-cppflags         Specify additional flags to pass to preprocessor] ,
+        [
+                if test "x$withval" != "xno"; then
+                        CPPFLAGS="$CPPFLAGS $withval"
+                fi
+        ]
+)
+
+
+AC_PROG_CC
+AC_PROG_INSTALL
+AC_PROG_MAKE_SET
+AC_PROG_RANLIB
+
+TS_CHECK_APACHE2
+TS_CHECK_REDLAND
+
+AC_SUBST(topdir)
+AC_SUBST(A_EXT)
+AC_SUBST(APXS)
+AC_SUBST(ARFLAGS)
+AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(PICFLAGS)
+AC_SUBST(REDLAND)
+AC_SUBST(SO_EXT)
+AC_SUBST(SO_FLAGS)
+
+AC_CONFIG_FILES([build/rules.mk
+                 libraries/b/Makefile
+		 modules/sparql/Makefile])
+
+AC_OUTPUT

Propchange: incubator/triplesoup/code/trunk/include/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 10 03:04:16 2007
@@ -0,0 +1 @@
+config.h

Added: incubator/triplesoup/code/trunk/include/config.h.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/include/config.h.in?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/include/config.h.in (added)
+++ incubator/triplesoup/code/trunk/include/config.h.in Tue Apr 10 03:04:16 2007
@@ -0,0 +1,16 @@
+/* include/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION

Added: incubator/triplesoup/code/trunk/install-sh
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/install-sh?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/install-sh (added)
+++ incubator/triplesoup/code/trunk/install-sh Tue Apr 10 03:04:16 2007
@@ -0,0 +1,323 @@
+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-05-14.22
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

Propchange: incubator/triplesoup/code/trunk/install-sh
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/triplesoup/code/trunk/libraries/Makefile
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/libraries/Makefile?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/libraries/Makefile (added)
+++ incubator/triplesoup/code/trunk/libraries/Makefile Tue Apr 10 03:04:16 2007
@@ -0,0 +1,13 @@
+DIRS=b
+
+all:	
+	@for d in $(DIRS); do                                          \
+		echo "\tBuilding in $$d";                                \
+		(cd $$d && make --no-print-directory) || exit 1;       \
+	done
+
+clean:
+	@for d in $(DIRS); do                                          \
+		echo "\tCleaning in $$d";                                \
+		(cd $$d && make clean --no-print-directory) || exit 1; \
+	done

Propchange: incubator/triplesoup/code/trunk/libraries/b/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 10 03:04:16 2007
@@ -0,0 +1,4 @@
+libb.*
+*.o
+*.lo
+Makefile

Added: incubator/triplesoup/code/trunk/libraries/b/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/libraries/b/Makefile.in?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/libraries/b/Makefile.in (added)
+++ incubator/triplesoup/code/trunk/libraries/b/Makefile.in Tue Apr 10 03:04:16 2007
@@ -0,0 +1,42 @@
+topsrcdir	= @top_srcdir@
+
+include $(topsrcdir)/build/rules.mk
+
+### defines
+
+DEFINES += -DB_INTERNAL
+MODULE		= b
+LIBRARY_NAME	= mozb_s
+
+CSRCS		= \
+		badd.c \
+		bcache.c \
+		bcount.c \
+		bdestroy.c \
+		berror.c \
+		bget.c \
+		bhash.c \
+		bio.c \
+		biterator.c \
+		bmd5.c \
+		bnew.c \
+		bremove.c \
+		bstring.c \
+		bsync.c \
+		btcache.c \
+		btempty.c \
+		btimer.c \
+		btriple.c
+
+OBJS=	$(CSRCS:%.c=%.o)
+LOBJS=	$(CSRCS:.c=.lo)
+
+### Rules
+all:	libb
+
+libb:	$(OBJS) $(LOBJS)
+	$(MAKE_STATIC)
+	$(MAKE_SHARED)
+
+clean:
+	$(RM) -f *.o *.lo *~ libb.*

Added: incubator/triplesoup/code/trunk/modules/Makefile
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/modules/Makefile?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/modules/Makefile (added)
+++ incubator/triplesoup/code/trunk/modules/Makefile Tue Apr 10 03:04:16 2007
@@ -0,0 +1,13 @@
+DIRS=sparql
+
+all:	
+	@for d in $(DIRS); do                                          \
+		echo "\tBuilding in $$d";                                \
+		(cd $$d && make --no-print-directory) || exit 1;       \
+	done
+
+clean:
+	@for d in $(DIRS); do                                          \
+		echo "\tCleaning in $$d";                                \
+		(cd $$d && make clean --no-print-directory) || exit 1; \
+	done

Propchange: incubator/triplesoup/code/trunk/modules/sparql/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr 10 03:04:16 2007
@@ -0,0 +1,6 @@
+*.slo
+*.o
+*.lo
+.libs
+Makefile
+

Added: incubator/triplesoup/code/trunk/modules/sparql/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/triplesoup/code/trunk/modules/sparql/Makefile.in?view=auto&rev=527078
==============================================================================
--- incubator/triplesoup/code/trunk/modules/sparql/Makefile.in (added)
+++ incubator/triplesoup/code/trunk/modules/sparql/Makefile.in Tue Apr 10 03:04:16 2007
@@ -0,0 +1,13 @@
+topsrcdir	= @top_srcdir@
+
+include $(topsrcdir)/build/rules.mk
+
+all: apxs
+
+apxs:	mod_sparql.c mod_sparql.h
+	@$(APXS) -c mod_sparql.c $(REDLAND_CFLAGS) $(REDLAND_LDFLAGS)
+	@$(APXS) -i -a mod_sparql.la
+	@echo "\t\tSPARQL module created and installed"
+
+clean:
+	@$(RM) *.la *.o *.lo *.slo



Mime
View raw message