Adding some machinery.

diff --git a/Makefile.am b/Makefile.am
index 09993b3..de7dbe5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ EXTRA_DIST =
        libtool.m4 \
        acx_pthread.m4 \
        depcomp \
+       doxygen.cfg \
        config_win32.h
 
 dist-hook:
@@ -18,18 +19,18 @@ dist-hook:
 
 SUBDIRS = schemas xmltooling xmltoolingtest
 
-#all-local: opensaml.spec pkginfo
-#
-#opensaml.spec: opensaml.spec.in Makefile
-#      rm -f $@.tmp
-#      sed < $< > $@.tmp \
-#          -e 's:@-VERSION-@:${VERSION}:'
-#      mv $@.tmp $@
-#
-#pkginfo: pkginfo.in Makefile
-#      rm -f $@.tmp
-#      sed < $< > $@.tmp \
-#          -e 's:@-VERSION-@:${VERSION}:'
-#      mv $@.tmp $@
-#
-#DISTCLEANFILES = opensaml.spec pkginfo
+all-local: xmltooling.spec pkginfo
+
+xmltooling.spec: xmltooling.spec.in Makefile
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
+
+pkginfo: pkginfo.in Makefile
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
+
+DISTCLEANFILES = xmltooling.spec pkginfo

diff --git a/doxyfile b/doxygen.cfg
similarity index 97%
rename from doxyfile
rename to doxygen.cfg
index f40463b..bf09336 100644 (file)
--- a/doxyfile
+++ b/doxygen.cfg
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 PROJECT_NAME           = XMLTooling-C
 PROJECT_NUMBER         = 1.0
-OUTPUT_DIRECTORY       = C:/cvs/cpp-xmltooling/doc
+OUTPUT_DIRECTORY       = doc
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = YES
@@ -26,7 +26,7 @@ ALWAYS_DETAILED_SEC    = NO
 INLINE_INHERITED_MEMB  = NO
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        = 
-STRIP_FROM_INC_PATH    = C:/cvs/cpp-xmltooling
+STRIP_FROM_INC_PATH    = .
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
 MULTILINE_CPP_IS_BRIEF = NO
@@ -82,7 +82,7 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = C:/cvs/cpp-xmltooling/xmltooling
+INPUT                  = xmltooling
 FILE_PATTERNS          = *.d \
                          *.java \
                          *.ii \
@@ -106,7 +106,7 @@ FILE_PATTERNS          = *.d \
                          *.dox \
                          *.py
 RECURSIVE              = YES
-EXCLUDE                = C:/cvs/cpp-xmltooling/xmltooling/signature/impl
+EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
 EXCLUDE_PATTERNS       = 
 EXAMPLE_PATH           = 
@@ -209,7 +209,7 @@ ENABLE_PREPROCESSING   = YES
 MACRO_EXPANSION        = YES
 EXPAND_ONLY_PREDEF     = NO
 SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = C:\cvs\cpp-xmltooling
+INCLUDE_PATH           = .
 INCLUDE_FILE_PATTERNS  = 
 PREDEFINED             = _MSC_VER \
                          DOXYGEN_SKIP

diff --git a/pkginfo.in b/pkginfo.in
new file mode 100644 (file)
index 0000000..653cc91
--- /dev/null
+++ b/pkginfo.in
@@ -0,0 +1,10 @@
+ARCH=sparc\r
+PKG=SHIBxmltool\r
+NAME=XML Tooling Library for C++\r
+VERSION=@-VERSION-@\r
+CATEGORY=system\r
+VENDOR=http://www.opensaml.org/ packaged for Shibboleth by Scott Cantor\r
+HOTLINE=http://bugzilla.internet2.edu/\r
+EMAIL=cantor.2@osu.edu\r
+PSTAMP=1May2006\r
+CLASSES=none\r

diff --git a/xmltooling.spec.in b/xmltooling.spec.in
new file mode 100644 (file)
index 0000000..4d17609
--- /dev/null
+++ b/xmltooling.spec.in
@@ -0,0 +1,82 @@
+Name:          xmltooling\r
+Summary:       Open source XMLTooling library\r
+Version:       @-VERSION-@\r
+Release:       1\r
+Group:         System Environment/Libraries\r
+Vendor:                Internet2\r
+License:       Apache 2.0\r
+URL:           http://www.opensaml.org/\r
+Source0:       http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz\r
+Source1:       http://shibboleth.internet2.edu/downloads/%{name}-%{version}.tar.gz.asc\r
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root\r
+\r
+BuildRequires: xerces-c-devel >= 2.6.1\r
+BuildRequires: xml-security-c-devel >= 1.3.0\r
+BuildRequires: log4cpp-devel >= 0.3.5, cxxtest \r
+\r
+%description\r
+The XMLTooling library contains generic XML parsing and processing\r
+classes based on the Xerces-C DOM. It adds more powerful facilities\r
+for declaring element- and type-specific API and implementation\r
+classes to add value around the DOM, as well as signing and encryption\r
+support.\r
+\r
+This package contains the xmltooling runtime library.\r
+\r
+%package devel\r
+Summary: XMLTooling development Headers\r
+Group: Development/Libraries\r
+Requires: %{name} = %{version}\r
+\r
+%description devel\r
+The XMLTooling library contains generic XML parsing and processing\r
+classes based on the Xerces-C DOM. It adds more powerful facilities\r
+for declaring element- and type-specific API and implementation\r
+classes to add value around the DOM, as well as signing and encryption\r
+support.\r
+\r
+This package contains the headers and other necessary files to build\r
+applications or libraries that use or extend the xmltooling library.\r
+\r
+%prep\r
+%setup -q\r
+\r
+%build\r
+%configure %{?xmltooling_options}\r
+make\r
+\r
+%install\r
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT\r
+rm -rf _docs\r
+\r
+make install DESTDIR=$RPM_BUILD_ROOT\r
+mv $RPM_BUILD_ROOT/usr/doc/xmltooling _docs\r
+\r
+%check || :\r
+make check\r
+\r
+%clean\r
+[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT\r
+\r
+%post\r
+/sbin/ldconfig\r
+\r
+%postun\r
+/sbin/ldconfig\r
+\r
+%files\r
+%defattr(-,root,root,-)\r
+#%doc _docs/LICENSE.txt _docs/NEWS.txt _docs/README.txt _docs/TODO.txt\r
+%{_bindir}/xmltoolingtest\r
+%{_libdir}/libxmltooling.so.*\r
+%dir %{_datadir}/xml/xmltooling\r
+%{_datadir}/xml/xmltooling\r
+\r
+%files devel\r
+%defattr(-,root,root,-)\r
+%{_includedir}\r
+%{_libdir}/libxmltooling.so\r
+\r
+%changelog\r
+* Wed Apr 12 2006  Scott Cantor  <cantor.2@osu.edu>  - 1.0-1\r
+- First SPEC file based on various versions in existence.\r