[xiph-commits] r8572 - trunk/oggdsf/src/tools/mod_timeslice

[ozone at motherfish-iii.xiph.org]

Author: ozone
Date: 2005-01-02 03:10:36 -0800 (Sun, 02 Jan 2005)
New Revision: 8572

Added:
   trunk/oggdsf/src/tools/mod_timeslice/.deps
   trunk/oggdsf/src/tools/mod_timeslice/Makefile
   trunk/oggdsf/src/tools/mod_timeslice/modules.mk
Modified:
   trunk/oggdsf/src/tools/mod_timeslice/
   trunk/oggdsf/src/tools/mod_timeslice/README.txt
Log:
oggdsf:
 * Added UNIX build support for mod_timeslice




Property changes on: trunk/oggdsf/src/tools/mod_timeslice
___________________________________________________________________
Name: svn:ignore
   + mod_timeslice.la mod_timeslice.lo mod_timeslice.slo .libs


Added: trunk/oggdsf/src/tools/mod_timeslice/.deps
===================================================================

Added: trunk/oggdsf/src/tools/mod_timeslice/Makefile
===================================================================
--- trunk/oggdsf/src/tools/mod_timeslice/Makefile	2005-01-02 07:15:46 UTC (rev 8571)
+++ trunk/oggdsf/src/tools/mod_timeslice/Makefile	2005-01-02 11:10:36 UTC (rev 8572)
@@ -0,0 +1,64 @@
+#
+# UNIX Makefile for mod_timeslice
+#
+# You may need to tweak the following variables in order to get things building
+# properly
+#
+
+builddir=.
+
+# point these to your apache 2 share directory
+top_srcdir=/usr/share/apache2
+top_builddir=/usr/share/apache2
+include /usr/share/apache2/build/special.mk
+
+# default to apxs2, but fallback to apxs if apxs2 can't be found
+APXS=$(shell [ -x `which apxs2` ] && echo apxs2 || \
+       echo apxs )
+
+# default to apache2ctl, but fallback to apachectl
+APACHECTL=$(shell [ -x `which apache2ctl` ] && echo apache2ctl || \
+	    echo apachectl )
+
+# default to GNU C++ compiler
+CXX=g++
+
+
+#
+# Tweakage stops here
+#
+
+
+#   additional defines, includes and libraries
+#DEFS=-Dmy_define=my_value
+#INCLUDES=-Imy/include/dir
+LIBS=-lOOOgg -lOOOggSeek
+CXXFLAGS=-w
+
+#   the default target
+all: local-shared-build
+
+#   install the shared object file into Apache 
+install: install-modules
+
+#   cleanup
+clean:
+	-rm -f mod_timeslice.o mod_timeslice.lo mod_timeslice.slo mod_timeslice.la 
+
+#   simple test
+test: reload
+	lynx -mime_header http://localhost/timeslice
+
+#   install and activate shared object by reloading Apache to
+#   force a reload of the shared object file
+reload: install restart
+
+#   the general Apache start/restart/stop
+#   procedures
+start:
+	$(APACHECTL) start
+restart:
+	$(APACHECTL) restart
+stop:
+	$(APACHECTL) stop
+


Property changes on: trunk/oggdsf/src/tools/mod_timeslice/Makefile
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: trunk/oggdsf/src/tools/mod_timeslice/README.txt
===================================================================
--- trunk/oggdsf/src/tools/mod_timeslice/README.txt	2005-01-02 07:15:46 UTC (rev 8571)
+++ trunk/oggdsf/src/tools/mod_timeslice/README.txt	2005-01-02 11:10:36 UTC (rev 8572)
@@ -43,16 +43,7 @@
 * Currently, only Annodex media files are supported.  Support for Ogg
   files will be forthcoming.
 
-* Only "simple" time queries are supported: i.e. integer-only, npt time
-  queries without the leading npt: time specification.  e.g. '?t=10' will
-  work, '?t=10.5' will not because we do not yet parse floating point
-  numbers, '?t=npt:10' will not work because of the leading npt:,
-  '?t=1:20' will not work since we do not yet parse MM:SS time formats.
-  Of course we will support the whole timed URI specification in the
-  future; consider this a cheap'n'cheerful implementation of the timed URI
-  specification for now.
 
-
 Requirements
 ------------
 
@@ -62,6 +53,11 @@
   available at <http://httpd.apache.org/download.cgi>.  Apache 2.0.52 is
   used for development.
 
+UNIX:
+
+* An Apache 2 installation of some sort with the Apache 2
+  development tools (such as apxs).
+
 Note that this module has been tested to work on Linux systems, but
 I haven't packaged the build system for it yet (though it's a standard
 apxs2 module build).
@@ -81,10 +77,14 @@
   accordingly.  (If you have ideas on how to make this easier for
   non-standard installations, let me know.)
 
-There is no building instructions provided for UNIX yet.  One will be
-provided in the future.
+UNIX:
 
+* We use a simple apxs-based build system, which is tested on
+  Debian GNU/Linux.  You may need to modify some Makefile variables to get
+  things working: see the first few lines of the Makefile to see what
+  variables to tweak.
 
+
 Installing
 ----------
 
@@ -96,11 +96,18 @@
 
   LoadModule timeslice_module /path/to/mod_timeslice.so
 
+Windows:
+
 * Copy mod_timeslice.so (and mod_timeslice.pdb, if you want to use the
   Visual Studio Debugger with Apache) to Apache's module directory,
   usually at C:\Program Files\Apache Group\Apache2\modules.
 
+UNIX:
 
+* Just run 'make install'.  You may need adminstrator privileges (i.e.
+  sudo or su)
+
+
 Copyright
 ---------
 

Added: trunk/oggdsf/src/tools/mod_timeslice/modules.mk
===================================================================
--- trunk/oggdsf/src/tools/mod_timeslice/modules.mk	2005-01-02 07:15:46 UTC (rev 8571)
+++ trunk/oggdsf/src/tools/mod_timeslice/modules.mk	2005-01-02 11:10:36 UTC (rev 8572)
@@ -0,0 +1,4 @@
+mod_timeslice.la: mod_timeslice.slo
+	$(SH_LINK) -rpath $(libexecdir) -module -avoid-version  mod_timeslice.lo
+DISTCLEAN_TARGETS = modules.mk
+shared =  mod_timeslice.la