tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject cvs commit: jakarta-tomcat-connectors/jni/native build.conf buildconf config.layout config.nice configure.in libtcnative.dsp libtcnative.dsw Makefile.in tcnative.dsp tcnative.pc.in
Date Fri, 14 Jan 2005 13:49:25 GMT
mturk       2005/01/14 05:49:25

  Added:       jni/native build.conf buildconf config.layout config.nice
                        configure.in libtcnative.dsp libtcnative.dsw
                        Makefile.in tcnative.dsp tcnative.pc.in
  Log:
  Initial upload
  
  Revision  Changes    Path
  1.1                  jakarta-tomcat-connectors/jni/native/build.conf
  
  Index: build.conf
  ===================================================================
  #
  # Configuration file for APRJAVA. Used by APR/build/gen-build.py
  #
  
  [options]
  
  # the platform-independent .c files
  paths =
    src/*.c
  
  # we have no platform-specific subdirs
  platform_dirs =
  
  # the public headers
  headers = include/*.h
  
  # we have a recursive makefile for the test files (for now)
  # test/*.c
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/buildconf
  
  Index: buildconf
  ===================================================================
  #!/bin/sh
  #
  # Copyright 1999-2004 The Apache Software Foundation
  #
  # 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.
  #
  #
  
  # Default place to look for apr source.  Can be overridden with 
  #   --with-apr=[directory]
  apr_src_dir=../apr
  
  while test $# -gt 0 
  do
    # Normalize
    case "$1" in
    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
    *) optarg= ;;
    esac
  
    case "$1" in
    --with-apr=*)
    apr_src_dir=$optarg
    ;;
    esac
  
    shift
  done
  
  if test -d "$apr_src_dir"
  then
    echo ""
    echo "Looking for apr source in $apr_src_dir"
  else
    echo ""
    echo "Problem finding apr source in $apr_src_dir."
    echo "Use:"
    echo "  --with-apr=[directory]" 
    exit 1
  fi
  
  # Remove some files, then copy them from apr source tree
  rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
        build/config.guess build/config.sub
  cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
     $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess  \
     $apr_src_dir/build/config.sub build
  
  # Remove aclocal.m4 as it'll break some builds...
  rm -rf aclocal.m4 autom4te*.cache
  
  echo "Creating configure ..."
  ### do some work to toss config.cache?
  if ${AUTOCONF:-autoconf}; then
    :
  else
    echo "autoconf failed"
    exit 1
  fi
  
  #
  # Generate build-outputs.mk for the build systme
  #
  echo "Generating 'make' outputs ..."
  $apr_src_dir/build/gen-build.py make
  
  # Remove autoconf cache again
  rm -rf autom4te*.cache
  
  # Create RPM Spec file
  if [ -f `which cut` ]; then
    echo rebuilding rpm spec file
    ( REVISION=`build/get-version.sh all include/tcn_version.h TCN`
      VERSION=`echo $REVISION | cut -d- -s -f1`
      RELEASE=`echo $REVISION | cut -d- -s -f2`
      if [ "x$VERSION" = "x" ]; then
        VERSION=$REVISION
        RELEASE=1
      fi
      cat ./build/rpm/tcnative.spec.in | \
      sed -e "s/TCN_VERSION/$VERSION/" \
          -e "s/TCN_RELEASE/$RELEASE/" \
      > tcnative.spec )
  fi
  
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/config.layout
  
  Index: config.layout
  ===================================================================
  ##
  ##  config.layout -- Pre-defined Installation Path Layouts
  ##
  ##  Hints:
  ##  - layouts can be loaded with configure's --enable-layout=ID option
  ##  - when no --enable-layout option is given, the default layout is `apr'
  ##  - a trailing plus character (`+') on paths is replaced with a 
  ##    `/<target>' suffix where <target> is currently hardcoded to 'apr'.
  ##    (This may become a configurable parameter at some point.)
  ##
  
  #   Classical Tomcat Native path layout designed for parallel installs.
  <Layout tcnative>
      prefix:        /usr/local/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/modules
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr-${TCNATIVE_MAJOR_VERSION}
      localstatedir: ${prefix}
      libsuffix:     -${TCNATIVE_MAJOR_VERSION}
  </Layout>
  
  #   Classical single-installation APR path layout.
  <Layout classic>
      prefix:        /usr/local/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/modules
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: ${prefix}
  </Layout>
  
  #   GNU standards conforming path layout.
  #   See FSF's GNU project `make-stds' document for details.
  <Layout GNU>
      prefix:        /usr/local
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/etc+
      datadir:       ${prefix}/share+
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include+
      localstatedir: ${prefix}/var+
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Mac OS X Server (Rhapsody)
  <Layout Mac OS X Server>
      prefix:        /Local/Library/WebServer
      exec_prefix:   /usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    /System/Library/apr/Modules
      mandir:        ${exec_prefix}/share/man
      sysconfdir:    ${prefix}/Configuration
      datadir:       ${prefix}
      installbuilddir: /System/Library/apr/Build
      includedir:    /System/Library/Frameworks/apr.framework/Versions/2.0/Headers
      localstatedir: /var
      runtimedir:    ${prefix}/Logs
  </Layout>
  
  #   Darwin/Mac OS Layout
  <Layout Darwin>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec+
      mandir:        ${prefix}/share/man
      datadir:       /Library/WebServer
      sysconfdir:    /etc+
      installbuilddir: ${prefix}/share/httpd/build
      includedir:    ${prefix}/include+
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Red Hat Linux 7.x layout
  <Layout RedHat>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${prefix}/bin
      sbindir:       ${prefix}/sbin
      libdir:        ${prefix}/lib
      libexecdir:    ${prefix}/lib/apr
      mandir:        ${prefix}/man
      sysconfdir:    /etc/httpd/conf
      datadir:       /var/www
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>     
  
  #   According to the /opt filesystem conventions
  <Layout opt>
      prefix:        /opt/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    /etc${prefix}
      datadir:       ${prefix}/share
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: /var${prefix}
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #  BeOS layout...
  <Layout beos>
      prefix:        /boot/home/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include
      localstatedir: ${prefix}
      runtimedir:    ${localstatedir}/logs
  </Layout>
  
  #   SuSE 6.x layout
  <Layout SuSE>
      prefix:        /usr
      exec_prefix:   ${prefix}
      bindir:        ${prefix}/bin
      sbindir:       ${prefix}/sbin
      libdir:        ${prefix}/lib
      libexecdir:    ${prefix}/lib/apr
      mandir:        ${prefix}/share/man
      sysconfdir:    /etc/httpd
      datadir:       /usr/local/httpd
      installbuilddir: ${datadir}/build
      includedir:    ${prefix}/include/apr
      localstatedir: /var/lib/httpd
      runtimedir:    /var/run
  </Layout>
  
  #   BSD/OS layout
  <Layout BSDI>
      prefix:        /var/www
      exec_prefix:   /usr/contrib
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec/apr
      mandir:        ${exec_prefix}/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${datadir}/build
      includedir:    ${exec_prefix}/include/apr
      localstatedir: /var
      runtimedir:    ${localstatedir}/run
  </Layout>
  
  #   Solaris 8 Layout
  <Layout Solaris>
      prefix:        /usr/apr
      exec_prefix:   ${prefix}
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/bin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/libexec
      mandir:        ${exec_prefix}/man
      sysconfdir:    /etc/apr
      datadir:       /var/apr
      installbuilddir: ${datadir}/build
      includedir:    ${exec_prefix}/include
      localstatedir: ${prefix}
      runtimedir:    /var/run
  </Layout>
  
  #   OpenBSD Layout
  <Layout OpenBSD>
      prefix:        /var/www
      exec_prefix:   /usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/lib/apr/modules
      mandir:        ${exec_prefix}/share/man
      sysconfdir:    ${prefix}/conf
      datadir:       ${prefix}
      installbuilddir: ${prefix}/build
      includedir:    ${exec_prefix}/lib/apr/include
      localstatedir: ${prefix}
      runtimedir:    ${prefix}/logs
  </Layout>
  
  # Debian layout
  <Layout Debian>
      prefix:        
      exec_prefix:   ${prefix}/usr
      bindir:        ${exec_prefix}/bin
      sbindir:       ${exec_prefix}/sbin
      libdir:        ${exec_prefix}/lib
      libexecdir:    ${exec_prefix}/lib/apr/modules
      mandir:        ${exec_prefix}/share/man
      datadir:       ${exec_prefix}/share/apr
      includedir:    ${exec_prefix}/include/apr-${TCNATIVE_MAJOR_VERSION}
      localstatedir: ${prefix}/var/run
      runtimedir:    ${prefix}/var/run
      infodir:       ${exec_prefix}/share/info
      libsuffix     -${TCNATIVE_MAJOR_VERSION}
      installbuilddir: ${prefix}/usr/share/apache2/build
  </Layout>
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/config.nice
  
  Index: config.nice
  ===================================================================
  #! /bin/sh
  #
  # Created by configure
  
  "./configure" \
  "--with-apr=../apr-1.0.1" \
  "$@"
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/configure.in
  
  Index: configure.in
  ===================================================================
  dnl
  dnl Process this file with autoconf to produce a configure script
  dnl
  
  AC_PREREQ(2.13)
  AC_INIT(configure.in)
  
  AC_CONFIG_AUX_DIR(build)
  
  sinclude(build/apr_common.m4)
  sinclude(build/tcnative.m4)
  sinclude(build/find_apr.m4)
  
  dnl Generate ./config.nice for reproducing runs of configure
  dnl 
  APR_CONFIG_NICE(config.nice)
  
  dnl # Some initial steps for configuration.  We setup the default directory
  dnl # and which files are to be configured.
  
  dnl Absolute source/build directory
  abs_srcdir=`(cd $srcdir && pwd)`
  abs_builddir=`pwd`
  
  if test "$abs_builddir" != "$abs_srcdir"; then
    USE_VPATH=1
    TCN_CONFIG_LOCATION=build
  else
    TCN_CONFIG_LOCATION=source
  fi
  
  AC_SUBST(TCN_CONFIG_LOCATION)
  
  AC_CANONICAL_SYSTEM
  
  AC_PROG_INSTALL
  
  dnl
  dnl compute the top directory of the build
  dnl note: this is needed for LIBTOOL and exporting the bundled Expat
  dnl
  top_builddir="$abs_builddir"
  AC_SUBST(top_builddir)
  AC_SUBST(abs_srcdir)
  AC_SUBST(abs_builddir)
  
  dnl Initialize mkdir -p functionality.
  APR_MKDIR_P_CHECK($abs_srcdir/build/mkdir.sh)
  
  dnl get our version information
  get_version="$abs_srcdir/build/get-version.sh"
  version_hdr="$abs_srcdir/include/tcn_version.h"
  TCNATIVE_MAJOR_VERSION="`$get_version major $version_hdr TCN`"
  TCNATIVE_DOTTED_VERSION="`$get_version all $version_hdr TCN`"
  
  AC_SUBST(TCNATIVE_DOTTED_VERSION)
  AC_SUBST(TCNATIVE_MAJOR_VERSION)
  
  echo "Tomcat Native Version: ${TCNATIVE_DOTTED_VERSION}"
  
  dnl Enable the layout handling code, then reparse the prefix-style
  dnl arguments due to autoconf being a PITA.
  APR_ENABLE_LAYOUT(tcnative)
  APR_PARSE_ARGUMENTS
  
  dnl
  dnl set up the compilation flags and stuff
  dnl
  
  TCNATIVE_INCLUDES=""
  TCNATIVE_PRIV_INCLUDES="-I$top_builddir/include"
  
  dnl
  dnl Find the APR includes directory and (possibly) the source (base) dir.
  dnl
  TCN_FIND_APR
  
  dnl
  dnl even though we use apr_rules.mk for building apr-util, we need
  dnl to grab CC and CPP ahead of time so that apr-util config tests
  dnl use the same compiler as APR; we need the same compiler options
  dnl and feature test macros as well
  dnl
  APR_SETIFNULL(CC, `$apr_config --cc`)
  APR_SETIFNULL(CPP, `$apr_config --cpp`)
  APR_ADDTO(CFLAGS, `$apr_config --cflags`)
  APR_ADDTO(CPPFLAGS, `$apr_config --cppflags`)
  
  AC_PROG_INSTALL
  
  dnl
  dnl  Find the APR-ICONV directory.
  dnl
  TCN_FIND_JDK
  TCN_FIND_JDK_OS
  AC_SUBST(JAVA_HOME)
  AC_SUBST(JAVA_PLATFORM)
  AC_SUBST(JAVA_OS)
  
  APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include])
  APR_ADDTO(TCNATIVE_PRIV_INCLUDES,[-I$JAVA_HOME/include/$JAVA_OS]) 
  
  so_ext=$APR_SO_EXT
  lib_target=$APR_LIB_TARGET
  AC_SUBST(so_ext)
  AC_SUBST(lib_target)
  
  TCNATIVE_LIBNAME="tcnative${libsuffix}"
  AC_SUBST(TCNATIVE_LIBNAME)
  
  EXTRA_OS_LINK=""
  host_alias=`uname -s`
  case "$host_alias" in
      dnl ### BeOS requires that ALL symbols resolve at LINK time!
      dnl ### 
      dnl ### So, if we're building on BeOS then we need to add in the
      dnl ### apr and expat libraries to the build or it'll die a truly horrible
      dnl ### death. We now use the apr-config tool to determine the correct
      dnl ### library to link against :)
  *AIX*|*Darwin*|*BeOS*)
      dnl need such stuff as -liconv to be specified when building libaprutil.la
      EXTRA_OS_LINK='$(TCNATIVE_LDFLAGS) $(TCNATIVE_LIBS)'
      ;;
  *)
      ;;
  esac
  
  AC_SUBST(EXTRA_OS_LINK)
  
  dnl
  dnl Prep all the flags and stuff for compilation and export to other builds
  dnl
  APR_ADDTO(TCNATIVE_LIBS, [$APR_LIBS])
  
  AC_SUBST(TCNATIVE_EXPORT_LIBS)
  AC_SUBST(TCNATIVE_PRIV_INCLUDES)
  AC_SUBST(TCNATIVE_INCLUDES)
  AC_SUBST(TCNATIVE_LDFLAGS)
  AC_SUBST(TCNATIVE_LIBS)
  AC_SUBST(LDFLAGS)
  
  dnl copy apr's rules.mk into our build directory.
  if test ! -d ./build; then
     $mkdir_p build
  fi
  cp $APR_BUILD_DIR/apr_rules.mk $abs_builddir/build/rules.mk
  
  
  dnl
  dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  dnl
  case "$host_alias" in
  *bsdi* | BSD/OS)
      # Check whether they've installed GNU make
      if make --version > /dev/null 2>&1; then
          INCLUDE_RULES="include $abs_builddir/build/rules.mk"
          INCLUDE_OUTPUTS="include $abs_srcdir/build-outputs.mk"
      else
          INCLUDE_RULES=".include \"$abs_builddir/build/rules.mk\""
          INCLUDE_OUTPUTS=".include \"$abs_srcdir/build-outputs.mk\""
      fi
      ;;
  *)
      INCLUDE_RULES="include $abs_builddir/build/rules.mk"
      INCLUDE_OUTPUTS="include $abs_srcdir/build-outputs.mk"
      ;;
  esac
  
  AC_SUBST(INCLUDE_RULES)
  AC_SUBST(INCLUDE_OUTPUTS)
  
  if test -d $srcdir/test; then
      test_Makefile="test/Makefile"
  fi
  
  dnl
  dnl everthing is done. 
  MAKEFILES="Makefile"
  AC_OUTPUT([
      tcnative.pc
      $MAKEFILES
  	],[
  TCNATIVE_MAJOR_VERSION=$TCNATIVE_MAJOR_VERSION
  ])
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/libtcnative.dsp
  
  Index: libtcnative.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="libtcnative" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=libtcnative - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "libtcnative.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "libtcnative.mak" CFG="libtcnative - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "libtcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "libtcnative - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "libtcnative - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I "$(JAVA_HOME)/include"
/I "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS"
/Fd"Release\libtcnative_src" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
  # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"Release/libtcnative-1.dll"
/opt:ref
  
  !ELSEIF  "$(CFG)" == "libtcnative - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I "$(JAVA_HOME)/include"
/I "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS"
/Fd"Debug\libtcnative_src" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
  # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/libtcnative-1.dll"
  
  !ENDIF 
  
  # Begin Target
  
  # Name "libtcnative - Win32 Release"
  # Name "libtcnative - Win32 Debug"
  # Begin Group "Source Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\src\dir.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\error.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\file.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\info.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\jnilib.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\lock.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\misc.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\mmap.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\network.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\poll.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\pool.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\proc.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\shm.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\stdlib.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\user.c
  # End Source File
  # End Group
  # Begin Group "Generated Files"
  
  # PROP Default_Filter ""
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\include\tcn.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\include\tcn_version.h
  # End Source File
  # End Group
  # Begin Group "Platform Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\src\netware.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\unix.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\win32.c
  # End Source File
  # End Group
  # Begin Source File
  
  SOURCE=.\libtcnative.rc
  # End Source File
  # Begin Source File
  
  SOURCE=..\apr\build\win32ver.awk
  
  !IF  "$(CFG)" == "libtcnative - Win32 Release"
  
  # PROP Ignore_Default_Tool 1
  USERDEP__WIN32="./include/tcn_version.h"	
  # Begin Custom Build - Creating Version Resource
  InputPath=..\apr\build\win32ver.awk
  
  ".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../apr/build/win32ver.awk libtcnative-1.dll "Tomcat Native Java Library"  ./include/tcn_version.h
> .\libtcnative.rc
  
  # End Custom Build
  
  !ELSEIF  "$(CFG)" == "libtcnative - Win32 Debug"
  
  # PROP Ignore_Default_Tool 1
  USERDEP__WIN32="./include/tcn_version.h"	
  # Begin Custom Build - Creating Version Resource
  InputPath=..\apr\build\win32ver.awk
  
  ".\libtcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../apr/build/win32ver.awk libtcnative-1.dll "Tomcat Native Java Library"  ./include/tcn_version.h
> .\libtcnative.rc
  
  # End Custom Build
  
  !ENDIF 
  
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/libtcnative.dsw
  
  Index: libtcnative.dsw
  ===================================================================
  Microsoft Developer Studio Workspace File, Format Version 6.00
  # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
  
  ###############################################################################
  
  Project: "libapr"="..\apr\libapr.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
  }}}
  
  ###############################################################################
  
  Project: "libaprjava"=".\libtcnative.dsp" - Package Owner=<4>
  
  Package=<5>
  {{{
  }}}
  
  Package=<4>
  {{{
      Begin Project Dependency
      Project_Dep_Name libapr
      End Project Dependency
  }}}
  
  ###############################################################################
  
  Global:
  
  Package=<5>
  {{{
  }}}
  
  Package=<3>
  {{{
  }}}
  
  ###############################################################################
  
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  #
  # Top-level Makefile for TCNATIVE
  #
  CPP = @CPP@
  
  # gets substituted into some targets
  TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
  TCNATIVE_DOTTED_VERSION=@TCNATIVE_DOTTED_VERSION@
  
  srcdir = @srcdir@
  VPATH = @srcdir@
  
  INCLUDES = @APR_INCLUDES@ @TCNATIVE_INCLUDES@ @TCNATIVE_PRIV_INCLUDES@
  APRUTIL_LDFLAGS = @TCNATIVE_LDFLAGS@
  APRUTIL_LIBS = @TCNATIVE_LIBS@
  
  TARGET_LIB = lib@TCNATIVE_LIBNAME@.la
  # INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
  # EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
  EXTRA_OS_LINK=@EXTRA_OS_LINK@
  APRUTIL_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
  INSTALL = @INSTALL@
  INSTALL_DATA = @INSTALL_DATA@
  
  TARGETS = $(TARGET_LIB)
  
  # bring in rules.mk for standard functionality
  @INCLUDE_RULES@
  @INCLUDE_OUTPUTS@
  
  CLEAN_SUBDIRS = test
  
  CLEAN_TARGETS = .make.dirs
  DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
  	build/rules.mk tcnative.pc
  EXTRACLEAN_TARGETS = configure aclocal.m4 build-outputs.mk \
  	build/apr_common.m4 build/find_apr.m4 build/install.sh \
  	build/config.guess build/config.sub tcnative.spec
  
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  bindir=@bindir@
  libdir=@libdir@
  includedir=@includedir@
  top_srcdir=@abs_srcdir@
  top_blddir=@abs_builddir@
  
  
  install: $(TARGET_LIB)
  	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
  		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
  	$(INSTALL_DATA) $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
  	$(INSTALL_DATA) $(top_blddir)/include/*.h $(DESTDIR)$(includedir)
  	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
  	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
  		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
  	done
  	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
  
  $(TARGET_LIB): $(OBJECTS)
  	$(LINK) @lib_target@ @TCNATIVE_LIBS@
  
  check: $(TARGET_LIB)
  	(cd test && $(MAKE) check)
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/tcnative.dsp
  
  Index: tcnative.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="tcnative" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  
  CFG=tcnative - Win32 Debug
  !MESSAGE This is not a valid makefile. To build this project using NMAKE,
  !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "tcnative.mak".
  !MESSAGE 
  !MESSAGE You can specify a configuration when running NMAKE
  !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "tcnative.mak" CFG="tcnative - Win32 Debug"
  !MESSAGE 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "tcnative - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE "tcnative - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
  !MESSAGE 
  
  # Begin Project
  # PROP AllowPerConfigDependencies 0
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  CPP=cl.exe
  MTL=midl.exe
  RSC=rc.exe
  
  !IF  "$(CFG)" == "tcnative - Win32 Release"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 0
  # PROP BASE Output_Dir "Release"
  # PROP BASE Intermediate_Dir "Release"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 0
  # PROP Output_Dir "Release"
  # PROP Intermediate_Dir "Release"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MD /W3 /Zi /O2 /I "./include" /I "../apr/include" /I "$(JAVA_HOME)/include"
/I "$(JAVA_HOME)/include/win32" /D "NDEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS"
/Fd"Release\tcnative_src" /FD /c
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD BASE RSC /l 0x409 /d "NDEBUG"
  # ADD RSC /l 0x409 /d "NDEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /opt:ref
  # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /debug /machine:I386 /out:"Release/tcnative-1.dll"
/opt:ref
  
  !ELSEIF  "$(CFG)" == "tcnative - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "Debug"
  # PROP BASE Intermediate_Dir "Debug"
  # PROP BASE Target_Dir ""
  # PROP Use_MFC 0
  # PROP Use_Debug_Libraries 1
  # PROP Output_Dir "Debug"
  # PROP Intermediate_Dir "Debug"
  # PROP Ignore_Export_Lib 0
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  # ADD CPP /nologo /MDd /W4 /GX /Zi /Od /I "./include" /I "../apr/include" /I "$(JAVA_HOME)/include"
/I "$(JAVA_HOME)/include/win32" /D "_DEBUG" /D "TCN_DECLARE_EXPORT" /D "WIN32" /D "_WINDOWS"
/Fd"Debug\tcnative_src" /FD /c
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
  # ADD BASE RSC /l 0x409 /d "_DEBUG"
  # ADD RSC /l 0x409 /d "_DEBUG"
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib
/nologo /base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386
  # ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib wldap32.lib ole32.lib /nologo
/base:"0x6EE00000" /subsystem:windows /dll /incremental:no /debug /machine:I386 /out:"Debug/tcnative-1.dll"
  
  !ENDIF 
  
  # Begin Target
  
  # Name "tcnative - Win32 Release"
  # Name "tcnative - Win32 Debug"
  # Begin Group "Source Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\src\dir.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\error.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\file.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\info.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\jnilib.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\lock.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\misc.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\mmap.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\network.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\poll.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\pool.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\proc.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\shm.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\stdlib.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\user.c
  # End Source File
  # End Group
  # Begin Group "Generated Files"
  
  # PROP Default_Filter ""
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\include\tcn.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\include\tcn_version.h
  # End Source File
  # End Group
  # Begin Group "Platform Files"
  
  # PROP Default_Filter ""
  # Begin Source File
  
  SOURCE=.\src\netware.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\unix.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\src\win32.c
  # End Source File
  # End Group
  # Begin Source File
  
  SOURCE=.\tcnative.rc
  # End Source File
  # Begin Source File
  
  SOURCE=..\apr\build\win32ver.awk
  
  !IF  "$(CFG)" == "tcnative - Win32 Release"
  
  # PROP Ignore_Default_Tool 1
  USERDEP__WIN32="./include/tcn_version.h"	
  # Begin Custom Build - Creating Version Resource
  InputPath=..\apr\build\win32ver.awk
  
  ".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../apr/build/win32ver.awk tcnative-1.dll "Tomcat Native Java Library"  ./include/tcn_version.h
> .\tcnative.rc
  
  # End Custom Build
  
  !ELSEIF  "$(CFG)" == "tcnative - Win32 Debug"
  
  # PROP Ignore_Default_Tool 1
  USERDEP__WIN32="./include/tcn_version.h"	
  # Begin Custom Build - Creating Version Resource
  InputPath=..\apr\build\win32ver.awk
  
  ".\tcnative.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  	awk -f ../apr/build/win32ver.awk tcnative-1.dll "Tomcat Native Java Library"  ./include/tcn_version.h
> .\tcnative.rc
  
  # End Custom Build
  
  !ENDIF 
  
  # End Source File
  # End Target
  # End Project
  
  
  
  1.1                  jakarta-tomcat-connectors/jni/native/tcnative.pc.in
  
  Index: tcnative.pc.in
  ===================================================================
  prefix=@prefix@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
  TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
  includedir=@includedir@
  
  Name: Tomcat native Java
  Description: Companion Native Java library
  Version: @TCNATIVE_DOTTED_VERSION@
  # assume that tcnative requires libapr of same major version
  Requires: apr-@TCNATIVE_MAJOR_VERSION@
  Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
  Cflags: -I${includedir}
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message