mturk 2005/01/16 23:17:06
Modified: jni/native Makefile.in build.conf libtcnative.dsp
libtcnative.dsw tcnative.dsp
jni/native/build/rpm tcnative.spec.in
Log:
Update build files.
Revision Changes Path
1.2 +3 -5 jakarta-tomcat-connectors/jni/native/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 14 Jan 2005 13:49:25 -0000 1.1
+++ Makefile.in 17 Jan 2005 07:17:06 -0000 1.2
@@ -11,14 +11,12 @@
VPATH = @srcdir@
INCLUDES = @APR_INCLUDES@ @TCNATIVE_INCLUDES@ @TCNATIVE_PRIV_INCLUDES@
-APRUTIL_LDFLAGS = @TCNATIVE_LDFLAGS@
-APRUTIL_LIBS = @TCNATIVE_LIBS@
+TCNATIVE_LDFLAGS = @TCNATIVE_LDFLAGS@
+TCNATIVE_LIBS = @TCNATIVE_LIBS@
TARGET_LIB = [EMAIL PROTECTED]@.la
-# INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-# EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
[EMAIL PROTECTED]@
-APRUTIL_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
+TCNATIVE_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
1.2 +1 -0 jakarta-tomcat-connectors/jni/native/build.conf
Index: build.conf
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/build.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.conf 14 Jan 2005 13:49:25 -0000 1.1
+++ build.conf 17 Jan 2005 07:17:06 -0000 1.2
@@ -10,6 +10,7 @@
# we have no platform-specific subdirs
platform_dirs =
+ os
# the public headers
headers = include/*.h
1.2 +6 -14 jakarta-tomcat-connectors/jni/native/libtcnative.dsp
Index: libtcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcnative.dsp 14 Jan 2005 13:49:25 -0000 1.1
+++ libtcnative.dsp 17 Jan 2005 07:17:06 -0000 1.2
@@ -172,15 +172,7 @@
# 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
+SOURCE=.\os\win32\system.c
# End Source File
# End Group
# Begin Source File
@@ -189,17 +181,17 @@
# End Source File
# Begin Source File
-SOURCE=..\apr\build\win32ver.awk
+SOURCE=.\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
+InputPath=.\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
+ awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
Library" ./include/tcn_version.h > .\libtcnative.rc
# End Custom Build
@@ -208,10 +200,10 @@
# PROP Ignore_Default_Tool 1
USERDEP__WIN32="./include/tcn_version.h"
# Begin Custom Build - Creating Version Resource
-InputPath=..\apr\build\win32ver.awk
+InputPath=.\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
+ awk -f ./build/win32ver.awk libtcnative-1.dll "Tomcat Native Java
Library" ./include/tcn_version.h > .\libtcnative.rc
# End Custom Build
1.2 +2 -2 jakarta-tomcat-connectors/jni/native/libtcnative.dsw
Index: libtcnative.dsw
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/libtcnative.dsw,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtcnative.dsw 14 Jan 2005 13:49:25 -0000 1.1
+++ libtcnative.dsw 17 Jan 2005 07:17:06 -0000 1.2
@@ -3,7 +3,7 @@
###############################################################################
-Project: "libapr"="..\apr\libapr.dsp" - Package Owner=<4>
+Project: "libapr"=..\apr\libapr.dsp - Package Owner=<4>
Package=<5>
{{{
@@ -15,7 +15,7 @@
###############################################################################
-Project: "libaprjava"=".\libtcnative.dsp" - Package Owner=<4>
+Project: "libtcnative"=.\libtcnative.dsp - Package Owner=<4>
Package=<5>
{{{
1.2 +6 -14 jakarta-tomcat-connectors/jni/native/tcnative.dsp
Index: tcnative.dsp
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/tcnative.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcnative.dsp 14 Jan 2005 13:49:25 -0000 1.1
+++ tcnative.dsp 17 Jan 2005 07:17:06 -0000 1.2
@@ -172,15 +172,7 @@
# 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
+SOURCE=.\os\win32\system.c
# End Source File
# End Group
# Begin Source File
@@ -189,17 +181,17 @@
# End Source File
# Begin Source File
-SOURCE=..\apr\build\win32ver.awk
+SOURCE=.\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
+InputPath=.\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
+ awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java Library"
./include/tcn_version.h > .\tcnative.rc
# End Custom Build
@@ -208,10 +200,10 @@
# PROP Ignore_Default_Tool 1
USERDEP__WIN32="./include/tcn_version.h"
# Begin Custom Build - Creating Version Resource
-InputPath=..\apr\build\win32ver.awk
+InputPath=.\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
+ awk -f ./build/win32ver.awk tcnative-1.dll "Tomcat Native Java Library"
./include/tcn_version.h > .\tcnative.rc
# End Custom Build
1.2 +7 -9
jakarta-tomcat-connectors/jni/native/build/rpm/tcnative.spec.in
Index: tcnative.spec.in
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/native/build/rpm/tcnative.spec.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tcnative.spec.in 14 Jan 2005 13:46:43 -0000 1.1
+++ tcnative.spec.in 17 Jan 2005 07:17:06 -0000 1.2
@@ -1,7 +1,7 @@
%define tcnative 1
-Summary: Apache Portable Runtime Java library
+Summary: Tomcat Native Java library
Name: tcnative
Version: TCN_VERSION
Release: TCN_RELEASE
@@ -13,21 +13,19 @@
BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release}
%description
-The mission of the Apache Portable Runtime (APR) is to provide a
+The mission of the Tomcat Native Livrary (TCN) is to provide a
free library of C data structures and routines. This library
-contains additional utility interfaces for APR; including support
-for XML, LDAP, database interfaces, URI parsing and more.
+contains additional utility interfaces for Java.
%package devel
Group: Development/Libraries
-Summary: APR Java library development kit
+Summary: Tomcat Native development kit
Requires: tcnative = %{version}-%{release}, apr-devel
%description devel
-This package provides the support files which can be used to
-build applications using the APR utility library. The mission
-of the Apache Portable Runtime (APR) is to provide a free
-library of C data structures and routines.
+The mission of the Tomcat Native Livrary (TCN) is to provide a
+free library of C data structures and routines. This library
+contains additional utility interfaces for Java.
%prep
%setup -q
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
