[tomcat-native] branch BZ-64260 created (now 24bd38e)

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[tomcat-native] branch BZ-64260 created (now 24bd38e)

Michael Osipov
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a change to branch BZ-64260
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git.


      at 24bd38e  BZ 64260: Clean up install target

This branch includes the following new commits:

     new 24bd38e  BZ 64260: Clean up install target

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

[tomcat-native] 01/01: BZ 64260: Clean up install target

Michael Osipov
This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch BZ-64260
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 24bd38e5b295a64cd01a4eccaa959bb686818e5c
Author: Michael Osipov <[hidden email]>
AuthorDate: Wed Mar 25 11:45:05 2020 +0100

    BZ 64260: Clean up install target
   
    Remove bin/, include/, lib/pkgconfig/ from install target since they serve no
    purpose for the outside world and rather might confuse people. libtcnative is
    solely intended to be loaded dynamically from within the JVM and not be used
    as a library for other C clients.
    The archive cannot be easily removed w/o restructuring configure.ac and
    Makefile.in. The conceptual flaw is to rely on libtool generated for APR,
    rather than generating a libtool in-place with *_DISABLE_STATIC/*_PROG_LIBTOOL
    through autoreconf. A proper approach is taken by Subversion's build/ac-macros/apr.mk.
---
 native/Makefile.in    | 15 +++------------
 native/configure.in   |  1 -
 native/tcnative.pc.in | 30 ------------------------------
 3 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/native/Makefile.in b/native/Makefile.in
index 6e6c68a..e6e0f11 100644
--- a/native/Makefile.in
+++ b/native/Makefile.in
@@ -39,7 +39,6 @@ TCNATIVE_LIBS = @TCNATIVE_LIBS@
 
 TARGET_LIB = lib@TCNATIVE_LIBNAME@.la
 EXTRA_OS_LINK=@EXTRA_OS_LINK@
-TCNATIVE_PCFILE = tcnative-$(TCNATIVE_MAJOR_VERSION).pc
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
@@ -61,29 +60,21 @@ LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPI
 CLEAN_SUBDIRS = test
 
 CLEAN_TARGETS = .make.dirs
-DISTCLEAN_TARGETS = config.cache config.log config.status libtool \
- build/rules.mk tcnative.pc
+DISTCLEAN_TARGETS = config.cache config.log config.status \
+ build/rules.mk
 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) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
- $(INSTALL_DATA) $(srcdir)/include/*.h $(DESTDIR)$(includedir)
- list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
- ( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
- done
+ $(APR_MKDIR) $(DESTDIR)$(libdir)
  $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
 
 $(TARGET_LIB): $(OBJECTS)
diff --git a/native/configure.in b/native/configure.in
index 9cc395f..ae3f366 100644
--- a/native/configure.in
+++ b/native/configure.in
@@ -282,7 +282,6 @@ dnl
 dnl everything is done.
 MAKEFILES="Makefile"
 AC_OUTPUT([
-    tcnative.pc
     $MAKEFILES
  ],[
 TCNATIVE_MAJOR_VERSION=$TCNATIVE_MAJOR_VERSION
diff --git a/native/tcnative.pc.in b/native/tcnative.pc.in
deleted file mode 100644
index 1fd7cb8..0000000
--- a/native/tcnative.pc.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You 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.
-#
-
-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-1
-Libs: -L${libdir} -l@TCNATIVE_LIBNAME@ @TCNATIVE_EXPORT_LIBS@
-Cflags: -I${includedir}


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]