Move building of packaging files into configure.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@630 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/Makefile.am b/Makefile.am
index c3c55a9..2f06a8d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,19 +13,13 @@ dist-hook:
 
 SUBDIRS = doc schemas xmltooling xmltoolingtest
 
-GENFILES = xmltooling.spec pkginfo Portfile
-
 if DX_COND_doc
-all-local: doxygen-doc $(GENFILES)
+all-local: doxygen-doc
 else
-all-local: $(GENFILES)
+all-local:
 endif
 
-$(GENFILES): %: %.in Makefile
-       rm -f $@.tmp
-       sed < $@.in > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
+GENFILES = xmltooling.spec pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
         cpp-xmltooling.sln \
@@ -39,5 +33,3 @@ EXTRA_DIST = $(DX_CONFIG) \
         $(GENFILES:%=%.in) \
         depend \
         postinstall
-
-DISTCLEANFILES = $(GENFILES)

diff --git a/Portfile.in b/Portfile.in
index eb6aa25..ecebc3a 100644 (file)
--- a/Portfile.in
+++ b/Portfile.in
@@ -1,24 +1,29 @@
 PortSystem 1.0
 
-name               xmltooling
-version            @-VERSION-@
-categories         shibboleth
-maintainers        cantor.2@osu.edu
-description        XMLTooling library for C++
-long_description   Toolkit for security-aware XML processing
-homepage           http://www.opensaml.org/
-master_sites       http://shibboleth.internet2.edu/downloads/opensaml/cpp/${version}/
-checksums          sha1 @CHECKSUM@
+name                @PACKAGE@
+version             @PACKAGE_VERSION@
+categories          security textproc xml shibboleth
+maintainers         snc scantor
+description         XMLTooling library for C++
+long_description    Toolkit for security-aware XML processing
+homepage            http://www.opensaml.org/
+  
+platforms           darwin
+depends_lib         port:curl \
+                    port:xercesc3 \
+                    port:xml-security-c \
+                    port:log4shib
 
-configure.args     --disable-static \
-                   --with-log4shib=${prefix} \
-                   --with-openssl=${prefix} \
-                   --with-curl=${prefix} \
-                   --with-xerces=${prefix} \
-                   --with-xmlsec=${prefix}
-
-
-depends_lib        port:curl \
-                   port:xercesc \
-                   port:xml-security-c \
-                   port:log4shib
+master_sites        http://shibboleth.internet2.edu/downloads/opensaml/cpp/2.2/
+checksums           sha1 @CHECKSUM@
+  
+configure.args      --disable-static \
+                    --with-openssl=${prefix} \
+                    --with-curl=${prefix} \
+                    --with-xerces=${prefix} \
+                    --with-xmlsec=${prefix}
+  
+  
+livecheck.check     regex
+livecheck.url       http://shibboleth.internet2.edu/downloads/shibboleth/cppsp/latest/mac/ports/shibboleth/xmltooling/Portfile
+livecheck.regex     "version *(\\d+\\.\\d+(\\.\\d+)?)"

diff --git a/configure.ac b/configure.ac
index ee72165..560d804 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -364,5 +364,7 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
 
 LIBTOOL="$LIBTOOL --silent"
 
-# output makefiles
-AC_OUTPUT(Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile)
+# output packaging and makefiles
+AC_CONFIG_FILES([xmltooling.spec pkginfo Portfile])
+AC_CONFIG_FILES([Makefile xmltooling/Makefile xmltoolingtest/Makefile schemas/Makefile doc/Makefile])
+AC_OUTPUT

diff --git a/pkginfo.in b/pkginfo.in
index 76b88a6..f2e85c0 100644 (file)
--- a/pkginfo.in
+++ b/pkginfo.in
@@ -1,6 +1,6 @@
 PKG=SHIBxmltool
-VERSION=@-VERSION-@
-NAME=xmltooling-c
+VERSION=@PACKAGE_VERSION@
+NAME=@PACKAGE@-c
 CATEGORY=application,textproc,security
 DESC=Library for DOM processing with Signature/Encryption for C++
 VENDOR=Internet2

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
index 2d23c45..bdfd9a6 100644 (file)
--- a/xmltooling.spec.in
+++ b/xmltooling.spec.in
@@ -1,5 +1,5 @@
-Name:          xmltooling
-Version:       @-VERSION-@
+Name:          @PACKAGE@
+Version:       @PACKAGE_VERSION@
 Release:       1
 Summary:    OpenSAML XMLTooling library
 Group:         System Environment/Libraries
@@ -36,12 +36,12 @@ classes to add value around the DOM, as well as signing and encryption
 support.
 
 %if 0%{?suse_version} > 1030
-%package -n libxmltooling3
+%package -n lib@PACKAGE@3
 Summary:    OpenSAML XMLTooling library
 Group:      Development/Libraries
-Provides:   xmltooling = %{version}
+Provides:   @PACKAGE@ = %{version}
 
-%description -n libxmltooling3
+%description -n lib@PACKAGE@3
 The XMLTooling library contains generic XML parsing and processing
 classes based on the Xerces-C DOM. It adds more powerful facilities
 for declaring element- and type-specific API and implementation
@@ -52,8 +52,8 @@ This package contains just the shared library.
 %endif
 
 %if 0%{?suse_version} > 1030
-%package -n libxmltooling-devel
-Requires: libxmltooling3 = %version
+%package -n lib@PACKAGE@-devel
+Requires: lib@PACKAGE@3 = %version
 %else
 %package devel
 Requires: %name = %version
@@ -74,7 +74,7 @@ Requires: xml-security-c-devel >= 1.4.0
 Requires: openssl-devel, curl-devel >= 7.10.6
 
 %if 0%{?suse_version} > 1030
-%description -n libxmltooling-devel
+%description -n lib@PACKAGE@-devel
 %else
 %description devel
 %endif
@@ -84,19 +84,19 @@ for declaring element- and type-specific API and implementation
 classes to add value around the DOM, as well as signing and encryption
 support.
 
-This package includes files needed for development with xmltooling.
+This package includes files needed for development with XMLTooling.
 
 %prep
 %setup -q
 
 %build
-%configure %{?xmltooling_options}
+%configure %{?@PACKAGE@_options}
 %{__make}
 
 %install
 %{__make} install DESTDIR=$RPM_BUILD_ROOT pkgdocdir=%{pkgdocdir}
 # Don't package unit tester if present.
-%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/xmltoolingtest
+%{__rm} -f $RPM_BUILD_ROOT/%{_bindir}/@PACKAGE@test
 
 %check
 %{__make} check
@@ -106,7 +106,7 @@ This package includes files needed for development with xmltooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%post -n libxmltooling3 -p /sbin/ldconfig
+%post -n lib@PACKAGE@3 -p /sbin/ldconfig
 %else
 %post -p /sbin/ldconfig
 %endif
@@ -114,25 +114,24 @@ This package includes files needed for development with xmltooling.
 
 %ifnos solaris2.8 solaris2.9 solaris2.10
 %if 0%{?suse_version} > 1030
-%postun -n libxmltooling3 -p /sbin/ldconfig
+%postun -n lib@PACKAGE@3 -p /sbin/ldconfig
 %else
 %postun -p /sbin/ldconfig
 %endif
 %endif
 
 %if 0%{?suse_version} > 1030
-%files -n libxmltooling3
+%files -n lib@PACKAGE@3
 %else
 %files
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libxmltooling.so.*
-%{_libdir}/libxmltooling-lite.so.*
-%dir %{_datadir}/xml/xmltooling
-%{_datadir}/xml/xmltooling/*
+%{_libdir}/*.so.*
+%dir %{_datadir}/xml/@PACKAGE@
+%{_datadir}/xml/@PACKAGE@/*
 
 %if 0%{?suse_version} > 1030
-%files -n libxmltooling-devel
+%files -n lib@PACKAGE@-devel
 %else
 %files devel
 %endif