| [vhffs-dev] [1442] Packaging in progress. |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1442
Author: beuss
Date: 2009-06-16 18:27:45 +0200 (Tue, 16 Jun 2009)
Log Message:
-----------
Packaging in progress. Autotoolized a couple of packages, adjusted a bunch of svn:ignore
Modified Paths:
--------------
trunk/Makefile.am
trunk/configure.ac
trunk/debian/control
trunk/debian/files
trunk/debian/rules
trunk/debian/vhffs-common.files
trunk/vhffs-backend/src/Makefile.am
trunk/vhffs-fs/vhffsfs.c
trunk/vhffs-irc/Makefile.am
Added Paths:
-----------
trunk/debian/vhffs-extra.dirs
trunk/debian/vhffs-extra.files
trunk/debian/vhffs-jabber.files
trunk/vhffs-autokill/Makefile.am
trunk/vhffs-forum/Makefile.am
trunk/vhffs-fssync/Makefile.am
Property Changed:
----------------
trunk/
trunk/debian/
trunk/vhffs-autokill/
trunk/vhffs-forum/
trunk/vhffs-fs/
trunk/vhffs-fssync/
trunk/vhffs-irc/
Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.log
depcomp
Makefile
config.status
autom4te.cache
missing
aclocal.m4
vhffs-test-dependencies
install-sh
+ compile
configure
Makefile.in
config.log
depcomp
Makefile
config.status
autom4te.cache
missing
aclocal.m4
vhffs-test-dependencies
install-sh
config.guess
build-arch-stamp
config.sub
build-indep-stamp
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -2,16 +2,18 @@
SITE_CONFIG_FILE = @CONFDIR@/vhffs.conf
-DISTCHECK_CONFIGURE_FLAGS = --enable-panel --enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
+DISTCHECK_CONFIGURE_FLAGS = --enable-extra --enable-panel \
+ --enable-public --enable-listengine --enable-robots --enable-backend --enable-compat --enable-jabber --enable-tools --enable-vhffs-fs
if INSTALL_VHFFS_FS
SUB_VHFFS_FS=vhffs-fs
endif
SUBDIRS = $(SUB_VHFFS_FS) vhffs-api vhffs-packages vhffs-backend vhffs-doc vhffs-compat vhffs-intl vhffs-jabber vhffs-listengine \
- vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-themes vhffs-tools vhffs-irc
+ vhffs-panel vhffs-public vhffs-robots vhffs-shells vhffs-themes vhffs-tools vhffs-irc vhffs-autokill \
+ vhffs-forum vhffs-fssync
-EXTRA_DIST = config.rpath m4/ChangeLog vhffs-forum vhffs-irc
+EXTRA_DIST = config.rpath m4/ChangeLog
help:
@echo "Help for VHFFS makefile"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/configure.ac 2009-06-16 16:27:45 UTC (rev 1442)
@@ -123,7 +123,7 @@
AC_HELP_STRING([--with-jabber-path=path],
[Complete path for jabber pipe (/usr/share/vhffs/jabber)]),
JABBERDIR=$withval,
- JABBERDIR=${prefix}/share/vhffs/jabber
+ JABBERDIR=${prefix}/lib/vhffs/jabber
)
AC_SUBST(JABBERDIR)
@@ -165,6 +165,17 @@
)
AC_SUBST(COMPATDIR)
+dnl Extra misc tools
+
+AC_ARG_WITH(extra-path,
+ AC_HELP_STRING([--with-extra-path=path],
+ [Complete path for misc extra tools (/usr/lib/vhffs/extra)]),
+ EXTRADIR=$withval,
+ EXTRADIR=${prefix}/lib/vhffs/extra
+)
+AC_SUBST(EXTRADIR)
+
+
dnl setup min uid and gid
AC_ARG_WITH(min-uid,
AC_HELP_STRING([--with-min-uid=uid],
@@ -266,6 +277,24 @@
AM_CONDITIONAL(INSTALL_IRC, test "$enable_irc" = yes)
+dnl Install extra tools or not ?
+AC_ARG_ENABLE(extra,
+ AC_HELP_STRING([--enable-extra],
+ [Enable extra tools (autokill, stsmon, etc.)
+ [default=no]]),
+ enable_extra=$enableval, enable_extra=no)
+
+AM_CONDITIONAL(INSTALL_EXTRA, test "$enable_extra" = yes)
+
+dnl Install vhffs-fssync or not ?
+AC_ARG_ENABLE(fssync,
+ AC_HELP_STRING([--enable-fssync],
+ [Enable fssync (useful for download reporisitories.)
+ [default=no]]),
+ enable_fssync=$enableval, enable_fssync=no)
+
+AM_CONDITIONAL(INSTALL_FSSYNC, test "$enable_fssync" = yes)
+
# -- Starting system checks
AC_CHECK_HEADERS([stdlib.h string.h sys/time.h syslog.h unistd.h])
@@ -291,6 +320,11 @@
AC_CONFIG_SUBDIRS([vhffs-fs])
fi
+if test "$enable_extra" = yes ; then
+ AM_PATH_GLIB_2_0( 2.0.0, [], [AC_MSG_FAILURE([Glib not found (needed for extra packages)])])
+ AM_PROG_CC_C_O
+fi
+
AC_CONFIG_FILES([ vhffs-intl/Makefile.in
vhffs-test-dependencies],
[chmod ug+x $ac_file]
@@ -305,10 +339,13 @@
vhffs-api/Makefile
vhffs-api/src/Makefile
vhffs-api/src/Vhffs/Makefile
+ vhffs-autokill/Makefile
vhffs-backend/Makefile
vhffs-backend/src/Makefile
vhffs-compat/Makefile
vhffs-doc/Makefile
+ vhffs-forum/Makefile
+ vhffs-fssync/Makefile
vhffs-jabber/Makefile
vhffs-listengine/Makefile
vhffs-listengine/src/Makefile
Property changes on: trunk/debian
___________________________________________________________________
Name: svn:ignore
+ *.debhelper.log
*.substvars
tmp
indep
vhffs
vhffs-fs
vhffs-extra
vhffs-api
vhffs-common
vhffs-jabber
vhffs-panel
vhffs-panel-public
vhffs-panel-members
vhffs-robots
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/debian/control 2009-06-16 16:27:45 UTC (rev 1442)
@@ -63,9 +63,17 @@
Package: vhffs-common
Architecture: all
Description: VHFFS - Common files
- VHFFS common files (configuration).
+ VHFFS common files (conguration, database initialization
+ scripts).
-Package: vhffs-extas
+Package: vhffs-extra
Architecture: any
Description: VHFFS - Extra packages
Some additional packages, patches, etc. for VHFFS.
+
+Package: vhffs-jabber
+Architecture: any
+Depends: jabber
+Description: VHFFS - Jabber connector
+ Connector allowing jabber to use VHFFS database as
+ authentication backend.
Modified: trunk/debian/files
===================================================================
--- trunk/debian/files 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/debian/files 2009-06-16 16:27:45 UTC (rev 1442)
@@ -5,4 +5,6 @@
vhffs-panel-public_4.2.0-1_i386.deb admin extra
vhffs-robots_4.2.0-1_i386.deb admin extra
vhffs-fs_4.2.0-1_i386.deb admin extra
+vhffs-extra_4.2.0-1_i386.deb admin extra
+vhffs-jabber_4.2.0-1_i386.deb admin extra
vhffs-common_4.2.0-1_all.deb admin extra
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/debian/rules 2009-06-16 16:27:45 UTC (rev 1442)
@@ -26,7 +26,9 @@
CROSS= --build $(DEB_BUILD_GNU_TYPE)
endif
-CONFIGURE_EXTRA_OPTIONS=--enable-vhffs-fs
+CONFIGURE_EXTRA_OPTIONS=--enable-vhffs-fs --enable-backend \
+ --enable-irc --enable-extra --enable-jabber \
+ --enable-fssync
# Multi-packages stuff
Modified: trunk/debian/vhffs-common.files
===================================================================
--- trunk/debian/vhffs-common.files 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/debian/vhffs-common.files 2009-06-16 16:27:45 UTC (rev 1442)
@@ -1,2 +1,3 @@
etc/vhffs/vhffs.conf.dist
etc/vhffs/vhffs.conf
+usr/share/vhffs/backend/initdb.sql
Added: trunk/debian/vhffs-extra.dirs
===================================================================
--- trunk/debian/vhffs-extra.dirs (rev 0)
+++ trunk/debian/vhffs-extra.dirs 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1,5 @@
+usr
+usr/lib
+usr/lib/vhffs
+usr/lib/vhffs/extra
+usr/lib/vhffs/extra/forum
Added: trunk/debian/vhffs-extra.files
===================================================================
--- trunk/debian/vhffs-extra.files (rev 0)
+++ trunk/debian/vhffs-extra.files 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1,4 @@
+usr/lib/vhffs/extra/*
+usr/share/vhffs/backend/mirror/*
+usr/lib/vhffs/extra/forum/*
+usr/lib/vhffs/extra/vhffs-fssync/*
Added: trunk/debian/vhffs-jabber.files
===================================================================
--- trunk/debian/vhffs-jabber.files (rev 0)
+++ trunk/debian/vhffs-jabber.files 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1 @@
+usr/lib/vhffs/jabber/vhffspipe.pl
Property changes on: trunk/vhffs-autokill
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
Makefile
autokill
..deps
Added: trunk/vhffs-autokill/Makefile.am
===================================================================
--- trunk/vhffs-autokill/Makefile.am (rev 0)
+++ trunk/vhffs-autokill/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1,7 @@
+if INSTALL_EXTRA
+
+autokilldir=@EXTRADIR@
+autokill_SOURCES=autokill.c
+autokill_PROGRAMS=autokill
+
+endif
Modified: trunk/vhffs-backend/src/Makefile.am
===================================================================
--- trunk/vhffs-backend/src/Makefile.am 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/vhffs-backend/src/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -18,4 +18,4 @@
done
backenddir=@BACKENDDIR@
-backend_data=pgsql/initdb.sql
+backend_DATA=pgsql/initdb.sql
Property changes on: trunk/vhffs-forum
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Added: trunk/vhffs-forum/Makefile.am
===================================================================
--- trunk/vhffs-forum/Makefile.am (rev 0)
+++ trunk/vhffs-forum/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1,8 @@
+if INSTALL_EXTRA
+
+forumdir=@EXTRADIR@/forum
+forum_DATA=antibot.tar.bz2 \
+ punbb-1.2.14_vhffs.patch \
+ punbb-1.2.15_vhffs.patch
+
+endif
Property changes on: trunk/vhffs-fs
___________________________________________________________________
Name: svn:ignore
- configure
Makefile.in
config.log
config.h
..deps
Makefile
config.status
stamp-h1
autom4te.cache
vhffsfs
aclocal.m4
+ configure
Makefile.in
config.log
config.h
..deps
Makefile
config.status
stamp-h1
autom4te.cache
vhffsfs
aclocal.m4
depcomp
rquota.h
rquota_xdr.c
missing
rquota_clnt.c
install-sh
Modified: trunk/vhffs-fs/vhffsfs.c
===================================================================
--- trunk/vhffs-fs/vhffsfs.c 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/vhffs-fs/vhffsfs.c 2009-06-16 16:27:45 UTC (rev 1442)
@@ -25,7 +25,7 @@
#if HAVE_CONFIG_H
#include <config.h>
#else
-#error You've to run configure script before building the sources
+#error You have to run configure script before building the sources
#endif
#include <fuse.h>
Property changes on: trunk/vhffs-fssync
___________________________________________________________________
Name: svn:ignore
+ Makefile.in
..deps
vhffsfssync_slave
vhffsfssync_master
Makefile
Added: trunk/vhffs-fssync/Makefile.am
===================================================================
--- trunk/vhffs-fssync/Makefile.am (rev 0)
+++ trunk/vhffs-fssync/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -0,0 +1,18 @@
+if INSTALL_FSSYNC
+
+vhffsfssync_masterdir=@EXTRADIR@/vhffs-fssync
+vhffsfssync_master_SOURCES=vhffsfssync_master.c
+vhffsfssync_master_PROGRAMS=vhffsfssync_master
+vhffsfssync_master_CPPFLAGS=@GLIB_CFLAGS@
+vhffsfssync_master_LDADD=@GLIB_LIBS@
+
+vhffsfssync_slavedir=@EXTRADIR@/vhffs-fssync
+vhffsfssync_slave_SOURCES=vhffsfssync_slave.c
+vhffsfssync_slave_PROGRAMS=vhffsfssync_slave
+vhffsfssync_slave_CPPFLAGS=@GLIB_CFLAGS@
+vhffsfssync_slave_LDADD=@GLIB_LIBS@
+
+#gcc -ggdb -Wall -Werror -o vhffsfssync_master `pkg-config --cflags --libs glib-2.0` vhffsfssync_master.c && ./vhffsfssync_master src
+#gcc -ggdb -Wall -Werror -o vhffsfssync_slave `pkg-config --cflags --libs glib-2.0` vhffsfssync_slave.c && ./vhffsfssync_slave dst0 127.0.0.1 4567
+
+endif
Property changes on: trunk/vhffs-irc
___________________________________________________________________
Name: svn:ignore
+ Makefile
Makefile.in
Modified: trunk/vhffs-irc/Makefile.am
===================================================================
--- trunk/vhffs-irc/Makefile.am 2009-06-16 05:46:02 UTC (rev 1441)
+++ trunk/vhffs-irc/Makefile.am 2009-06-16 16:27:45 UTC (rev 1442)
@@ -1,4 +1,4 @@
-if INSTALL_JABBER
+if INSTALL_IRC
ircdir = @IRCDIR@
irc_SCRIPTS = modobot.pl