Changeset 24


Ignore:
Timestamp:
01/15/06 13:46:09 (16 years ago)
Author:
bas
Message:

EmailtoTracScript?:

email2trac:

  • we can now set the default poth for the config file with configure for email2trac.py
  • Added svn keywords for all the files
  • Updated the install doc
Location:
emailtotracscript/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • emailtotracscript/trunk/INSTALL

    r20 r24  
    3131First build, install email2trac :
    3232
    33   * Edit Makefile, adjust the variables (in particular INSTALL_DIR, MTA_USER
    34     and TRAC_USER)
     33  * ./configure (see --help)
     34    {{{
     35    default values for:
     36       prefix=/usr/local        --> --prefix=<path>
     37       exec_prefix=$prefix/bin  --> --exec_prefix=<path>
     38       sysconfdir=$prefix/etc   --> --sysconfdir=<path>
     39       MTA_USER=nobody          --> --with-mta_user=<name>
     40       TRAC_USER=www-data       --> --with-trac_user=<name>
     41    }}}
    3542  * make
    3643  * make install
    37   * Define a symlink /etc/email2trac.conf referencing
    38     $INSTALL_DIR/email2trac.conf
     44  * First install copy emailtrac.conf to $sysconfdir
    3945
    4046 After installation, edit email2trac.conf for your site. Most important
  • emailtotracscript/trunk/Makefile.in

    r23 r24  
    66#      $Id$
    77#
    8 # defaullt values are:
    9 #
    108#
    119PREFIX=@prefix@
    12 INSTALL_BIN=$(PREFIX)/bin
     10EXEC_PREFIX=@exec_prefix@/bin
    1311PYTHON_BIN=@PYTHON@
     12CONFIG=@sysconfdir@
    1413
    1514# User names
     
    2019CC=@CC@
    2120DEBUG=0
    22 CFLAGS=-DMTA_USER=\"$(MTA_USER)\" -DTRAC_USER=\"$(TRAC_USER)\" -DTRAC_SCRIPT_NAME=\"$(TRAC_SCRIPT_NAME)\" -DTRAC_SCRIPT_PATH=\"$(INSTALL_BIN)\" -DDEBUG=$(DEBUG)
     21CFLAGS=-DMTA_USER=\"$(MTA_USER)\" -DTRAC_USER=\"$(TRAC_USER)\" -DTRAC_SCRIPT_NAME=\"$(TRAC_SCRIPT_NAME)\" -DTRAC_SCRIPT_PATH=\"$(EXEC_PREFIX)\" -DDEBUG=$(DEBUG)
    2322
    2423PYTHON_FILES=delete_spam.py email2trac.py
     
    2726all: run_email2trac
    2827
    29 run_email2trac: $(WRAPPER_SRC)
     28run_email2trac: $(WRAPPER_SRC) Makefile
    3029        $(CC) $(CFLAGS) -o $@ run_email2trac.c
    3130
    3231install: all
    33         install --mode=4700 --owner=root run_email2trac $(INSTALL_BIN)
     32        install --mode=4700 --owner=root run_email2trac $(EXEC_PREFIX)
    3433        for script in $(PYTHON_FILES) ; \
    3534        do \
    3635          name=`basename $$script '.py'` ; \
    37           install --mode=755 --owner=root $$script  $(INSTALL_BIN)/$$name
     36          install --mode=755 --owner=root $$script  $(EXEC_PREFIX)/$$name
    3837        done
    3938
    4039clean:
    41         rm run_email2trac email2trac.py delete_spam.py config.log config.status
     40        rm run_email2trac
     41
     42distclean:
     43        rm run_email2trac email2trac.py delete_spam.py config.log config.status Makefile
  • emailtotracscript/trunk/configure

    r23 r24  
    273273
    274274ac_unique_file="email2trac.py.in"
    275 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir trac_user mta_user PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBOBJS LTLIBOBJS'
     275ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS pyexecdir trac_user mta_user email2trac_conf PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pkgpyexecdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP SYSTEM_EMAIL2TRAC_CONF LIBOBJS LTLIBOBJS'
    276276ac_subst_files=''
    277277
     
    12681268
    12691269
     1270
     1271
     1272
    12701273        # Find any Python interpreter.
    12711274    for ac_prog in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
     
    26102613
    26112614
    2612 
     2615# Now a user can specify the TRAC user
     2616#
    26132617
    26142618# Check whether --with-trac_user or --without-trac_user was given.
     
    26222626
    26232627fi;
     2628# Now a user can specify MTA TRAC user
     2629#
    26242630
    26252631# Check whether --with-mta_user or --without-mta_user was given.
     
    26322638  mta_user="nobody"
    26332639
    2634 fi;                               ac_config_files="$ac_config_files Makefile email2trac.py delete_spam.py"
     2640fi;
     2641if test "$sysconfdir" = '${prefix}/etc'; then
     2642  if test "x$prefix" = xNONE; then
     2643    email2trac_conf="$ac_default_prefix/etc/email2trac.conf"
     2644  else
     2645    email2trac_conf="$prefix/etc/email2trac.conf"
     2646  fi
     2647else
     2648  email2trac_conf="$sysconfdir/email2trac.conf"
     2649fi
     2650
     2651cat >>confdefs.h <<_ACEOF
     2652#define SYSTEM_EMAIL2TRAC_CONF "$email2trac_conf"
     2653_ACEOF
     2654
     2655
     2656
     2657
     2658
     2659                              ac_config_files="$ac_config_files Makefile email2trac.py delete_spam.py"
    26352660cat >confcache <<\_ACEOF
    26362661# This file is a shell script that caches the results of configure
     
    32723297s,@trac_user@,$trac_user,;t t
    32733298s,@mta_user@,$mta_user,;t t
     3299s,@email2trac_conf@,$email2trac_conf,;t t
    32743300s,@PYTHON@,$PYTHON,;t t
    32753301s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t
     
    32893315s,@CPP@,$CPP,;t t
    32903316s,@EGREP@,$EGREP,;t t
     3317s,@SYSTEM_EMAIL2TRAC_CONF@,$SYSTEM_EMAIL2TRAC_CONF,;t t
    32913318s,@LIBOBJS@,$LIBOBJS,;t t
    32923319s,@LTLIBOBJS@,$LTLIBOBJS,;t t
  • emailtotracscript/trunk/configure.in

    • Property svn:keywords set to Id
    r23 r24  
     1#
     2# Author: Bas van der Vlies <basv@sara.nl>
     3# Desc. : Simple configure script for email2trac package
     4# SVN INFO:
     5#       $Id$
     6#
     7#
    18AC_INIT(email2trac.py.in)
    29AC_SUBST(prefix)
     
    512AC_SUBST(trac_user)
    613AC_SUBST(mta_user)
     14AC_SUBST(sysconfdir)
    715
    816AM_PATH_PYTHON
    917AC_PROG_GCC_TRADITIONAL
    1018
    11 
     19# Now a user can specify the TRAC user
     20#
    1221AC_ARG_WITH(trac_user,
    1322[
     
    2231)dnl           
    2332
     33# Now a user can specify MTA TRAC user
     34#
    2435AC_ARG_WITH(mta_user,
    2536[
     
    3344  [mta_user="nobody"]
    3445)dnl           
     46
     47dnl ##### Path to email2trac.conf
     48dnl This ugly kludge to get the sysconfdir path is needed because
     49dnl autoconf doesn't actually set the prefix variable until later.
     50if test "$sysconfdir" = '${prefix}/etc'; then
     51  if test "x$prefix" = xNONE; then
     52    email2trac_conf="$ac_default_prefix/etc/email2trac.conf"
     53  else
     54    email2trac_conf="$prefix/etc/email2trac.conf"
     55  fi
     56else
     57  email2trac_conf="$sysconfdir/email2trac.conf"
     58fi
     59AC_DEFINE_UNQUOTED(SYSTEM_EMAIL2TRAC_CONF, "$email2trac_conf",
     60                   [Full path for the system-wide email2trac.conf file.])
     61
     62AC_SUBST(email2trac_conf)
     63AC_SUBST(SYSTEM_EMAIL2TRAC_CONF)
     64
     65
    3566AC_OUTPUT(
    3667        Makefile
  • emailtotracscript/trunk/email2trac.py.in

    r22 r24  
    489489        # Default config file
    490490        #
    491         configfile = '/etc/email2trac.conf'
    492         # configfile = './email2trac.conf'
     491        configfile = '@email2trac_conf@'
    493492        project = ''
    494493        component = ''
  • emailtotracscript/trunk/run_email2trac.c

    • Property svn:keywords set to Id
    r5 r24  
    11/*
    22        run_email2trac.c
    3         Authors: Bas van der Vlies and Walter de Jong
     3        Authors: Bas van der Vlies, Walter de Jong and Michel Jouvin
     4        SVN Info:
     5                $Id$
    46
    57        Only nobody can become the user www-data. Postfix uses this
     
    2527#
    2628*/
    27 
    2829#include <stdlib.h>
    2930#include <unistd.h>
  • emailtotracscript/trunk/run_email2trac.h

    • Property svn:keywords set to Id
    r21 r24  
    11/*
     2
     3AUTHOR: Michel Jouvin
     4SVN Info:
     5        $Id$
     6
    27Local site configuration
    38Value defined here are just default values than can be overriden at compile time
Note: See TracChangeset for help on using the changeset viewer.