rm -rf `find $(distdir)/isapi_shib -name .svn`
rm -rf `find $(distdir)/doc/api -name .svn`
-GENFILES = shibboleth.spec pkginfo Portfile
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
EXTRA_DIST = $(DX_CONFIG) \
isapi_shib \
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 2,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
VALUE "Comments", "\0"\r
VALUE "CompanyName", "Internet2\0"\r
VALUE "FileDescription", "Shibboleth ADFSv1 Plugin\0"\r
- VALUE "FileVersion", "2, 3, 1, 0\0"\r
+ VALUE "FileVersion", "2, 4, 0, 0\0"\r
#ifdef SHIBSP_LITE\r
VALUE "InternalName", "adfs-lite\0"\r
#else\r
VALUE "OriginalFilename", "adfs.so\0"\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.3.1\0"\r
- VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4\0"\r
+ VALUE "ProductVersion", "2, 4, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 1.3 Module\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "mod_shib_13\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_13.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 2.0 Module\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "mod_shib_20\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_20.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Apache 2.2 Module\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "mod_shib_22\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "mod_shib_22.so\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
#define PACKAGE_NAME "shibboleth"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "shibboleth 2.3.1"
+#define PACKAGE_STRING "shibboleth 2.4"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "shibboleth"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.3.1"
+#define PACKAGE_VERSION "2.4"
/* Define to the necessary symbol if this constant uses a non-standard name on
your system. */
/* #undef TM_IN_SYS_TIME */
/* Version number of package */
-#define VERSION "2.3.1"
+#define VERSION "2.4"
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
AC_PREREQ([2.50])
-AC_INIT([shibboleth], [2.3.1], [shibboleth-users@internet2.edu], [shibboleth])
+AC_INIT([shibboleth], [2.4], [shibboleth-users@internet2.edu], [shibboleth])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([shibboleth],[2.3.1])
+AM_INIT_AUTOMAKE([shibboleth],[2.4])
sinclude(doxygen.m4)
sinclude(acx_pthread.m4)
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
+AC_PATH_PROG(PKG_CONFIG, pkg-config)
AC_LANG(C)
fi])
if test "x$SSLFLAGS" = "x" ; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config)
if test "x$PKG_CONFIG" != x && test "x$PKG_CONFIG" != "xno" ; then
if pkg-config openssl ; then
SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
[if test x_$with_xmltooling != x_/usr; then
LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS"
CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS"
+ export PKG_CONFIG_PATH="${with_xmltooling}/lib/pkgconfig"
fi])
LITE_LIBS="-lxmltooling-lite"
XMLSEC_LIBS="-lxmltooling"
# restore master libs
LIBS="$save_LIBS"
+# Determine xmltooling version.
+XMLTOOLINGVER="1.4"
+AC_ARG_WITH(xmltoolingver,
+ AC_HELP_STRING([--with-xmltoolingver=VERSION], [xmltooling version, normally derived via pkg-config]),
+ [XMLTOOLINGVER="$with_xmltoolingver"],
+ [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then
+ if pkg-config xmltooling ; then
+ XMLTOOLINGVER="`$PKG_CONFIG --modversion xmltooling`"
+ fi
+ fi])
+
# Establish location of xmltooling catalog.
XMLTOOLINGXMLDIR=""
if test "x$with_xmltooling" = "x" ; then
with_xmltooling="/usr"
fi
-if test -f $with_xmltooling/share/xml/xmltooling/catalog.xml ; then
+if test -f $with_xmltooling/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
XMLTOOLINGXMLDIR="$with_xmltooling"
-elif test -f $with_xerces/share/xml/xmltooling/catalog.xml ; then
+elif test -f $with_xerces/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
XMLTOOLINGXMLDIR="$with_xerces"
-elif test -f $with_log4shib/share/xml/xmltooling/catalog.xml ; then
+elif test -f $with_log4shib/share/xml/xmltooling-$XMLTOOLINGVER/catalog.xml ; then
XMLTOOLINGXMLDIR="$with_log4shib"
fi
if test "x$XMLTOOLINGXMLDIR" = "x" ; then
AC_MSG_ERROR([xmltooling XML catalog not found, may need to use --with-xmltooling option])
fi
-XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling"
+XMLTOOLINGXMLDIR="$XMLTOOLINGXMLDIR/share/xml/xmltooling-$XMLTOOLINGVER"
AC_SUBST(XMLTOOLINGXMLDIR)
# XML-Security settings
# restore master libs
LIBS="$save_LIBS"
+# Determine opensaml version.
+OPENSAMLVER="2.4"
+AC_ARG_WITH(samlver,
+ AC_HELP_STRING([--with-samlver=VERSION], [opensaml version, normally derived via pkg-config]),
+ [OPENSAMLVER="$with_samlver"],
+ [if test "x$PKG_CONFIG" != "x" && test "x$PKG_CONFIG" != "xno" ; then
+ if pkg-config opensaml ; then
+ OPENSAMLVER="`$PKG_CONFIG --modversion opensaml`"
+ fi
+ fi])
+
# Establish location of opensaml catalogs.
OPENSAMLXMLDIR=""
if test "x$with_saml" = "x" ; then
with_saml="/usr"
fi
-if test -f $with_saml/share/xml/opensaml/saml20-catalog.xml ; then
+if test -f $with_saml/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
OPENSAMLXMLDIR="$with_saml"
-elif test -f $with_xmltooling/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_xmltooling/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
OPENSAMLXMLDIR="$with_xmltooling"
-elif test -f $with_xerces/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_xerces/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
OPENSAMLXMLDIR="$with_xerces"
-elif test -f $with_log4shib/share/xml/opensaml/saml20-catalog.xml ; then
+elif test -f $with_log4shib/share/xml/opensaml-$OPENSAMLVER/saml20-catalog.xml ; then
OPENSAMLXMLDIR="$with_log4shib"
fi
if test "x$OPENSAMLXMLDIR" = "x" ; then
AC_MSG_ERROR([opensaml XML catalogs not found, may need to use --with-saml option])
fi
-OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml"
+OPENSAMLXMLDIR="$OPENSAMLXMLDIR/share/xml/opensaml-$OPENSAMLVER"
AC_SUBST(OPENSAMLXMLDIR)
AC_SUBST(LITE_LIBS)
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 2,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
VALUE "Comments", "\0"\r
VALUE "CompanyName", "Internet2\0"\r
VALUE "FileDescription", "Shibboleth FastCGI Authorizer\0"\r
- VALUE "FileVersion", "2, 3, 1, 0\0"\r
+ VALUE "FileVersion", "2, 4, 0, 0\0"\r
VALUE "InternalName", "shibauthorizer\0"\r
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibauthorizer.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.3.1\0"\r
- VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4\0"\r
+ VALUE "ProductVersion", "2, 4, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 2,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
VALUE "Comments", "\0"\r
VALUE "CompanyName", "Internet2\0"\r
VALUE "FileDescription", "Shibboleth FastCGI Responder\0"\r
- VALUE "FileVersion", "2, 3, 1, 0\0"\r
+ VALUE "FileVersion", "2, 4, 0, 0\0"\r
VALUE "InternalName", "shibresponder\0"\r
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibresponder.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.3.1\0"\r
- VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4\0"\r
+ VALUE "ProductVersion", "2, 4, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth ISAPI Filter / Extension\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "isapi_shib\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "isapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth Memcache Storage Service Plugin\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "memcache-store\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "OriginalFilename", "memcache-store.so\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
END
END
BLOCK "VarFileInfo"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
VALUE "Comments", "\0"
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth NSAPI Extension\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "nsapi_shib\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "nsapi_shib.dll\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,3,1,0
- PRODUCTVERSION 2,3,1,0
+ FILEVERSION 2,4,0,0
+ PRODUCTVERSION 2,4,0,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "FileDescription", "Shibboleth ODBC Storage Service Plugin\0"
- VALUE "FileVersion", "2, 3, 1, 0\0"
+ VALUE "FileVersion", "2, 4, 0, 0\0"
VALUE "InternalName", "odbc-store\0"
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"
VALUE "OriginalFilename", "odbc-store.so\0"
- VALUE "ProductName", "Shibboleth 2.3.1\0"
- VALUE "ProductVersion", "2, 3, 1, 0\0"
+ VALUE "ProductName", "Shibboleth 2.4\0"
+ VALUE "ProductVersion", "2, 4, 0, 0\0"
END
END
BLOCK "VarFileInfo"
AUTOMAKE_OPTIONS = foreign
-pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
schemafiles = \
shibboleth.xsd \
-Name: @PACKAGE@
+Name: @PACKAGE_NAME@
Version: @PACKAGE_VERSION@
Release: 1
Summary: Open source system for attribute-based Web SSO
%{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
%{!?_with_log4cpp:BuildRequires: log4shib-devel}
%endif
-BuildRequires: gcc-c++
+BuildRequires: gcc-c++, pkgconfig, zlib-devel
%{!?_without_doxygen:BuildRequires: doxygen}
%{!?_without_odbc:BuildRequires:unixODBC-devel}
-BuildRequires: zlib-devel
%{?_with_fastcgi:BuildRequires: fcgi-devel}
%if "%{_vendor}" == "redhat"
%{!?_without_builtinapache:BuildRequires: httpd-devel}
%exclude %{_libdir}/%{name}/*.la
%dir %{_localstatedir}/log/%{name}
%dir %{_localstatedir}/run/%{name}
-%dir %{_datadir}/xml/%{name}
-%{_datadir}/xml/%{name}/*
+%dir %{_datadir}/xml/%{name}-%{version}
+%{_datadir}/xml/%{name}-%{version}/*
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/*.xml
%config(noreplace) %{_sysconfdir}/%{name}/*.html
%doc %{pkgdocdir}/api
%changelog
+* Fri Dec 25 2009 Scott Cantor <cantor.2@osu.edu> - 2.4-1
+- Bump version and version schema folder.
+
* Mon Nov 23 2009 Scott Cantor <cantor.2@osu.edu> - 2.3.1-1
- Reset revision for 2.3.1 release
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 2,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
VALUE "Comments", "\0"\r
VALUE "CompanyName", "Internet2\0"\r
VALUE "FileDescription", "Shibboleth Daemon Service\0"\r
- VALUE "FileVersion", "2, 3, 1, 0\0"\r
+ VALUE "FileVersion", "2, 4, 0, 0\0"\r
VALUE "InternalName", "shibd\0"\r
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
VALUE "OriginalFilename", "shibd.exe\0"\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.3.1\0"\r
- VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4\0"\r
+ VALUE "ProductVersion", "2, 4, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
# this is different from the project version
# http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 4:1:0
-libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 4:1:0
+libshibsp_la_LDFLAGS = $(XMLSEC_LIBS) -version-info 5:0:0
+libshibsp_lite_la_LDFLAGS = $(LITE_LIBS) -version-info 5:0:0
libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@-@PACKAGE_VERSION@
logdir = ${localstatedir}/log
rundir = $(localstatedir)/run
xmldir = $(datadir)/xml
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xmltooling-lite1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(ConfigurationName)"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_3.lib xmltooling-lite1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,3,1,0\r
- PRODUCTVERSION 2,3,1,0\r
+ FILEVERSION 1,4,0,0\r
+ PRODUCTVERSION 2,4,0,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
#else\r
VALUE "FileDescription", "Shibboleth SP Library\0"\r
#endif\r
- VALUE "FileVersion", "1, 3, 0, 0\0"\r
+ VALUE "FileVersion", "1, 4, 0, 0\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
- VALUE "InternalName", "shibsp-lite1_3D\0"\r
+ VALUE "InternalName", "shibsp-lite1_4D\0"\r
#else\r
- VALUE "InternalName", "shibsp-lite1_3\0"\r
+ VALUE "InternalName", "shibsp-lite1_4\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "InternalName", "shibsp1_3D\0"\r
+ VALUE "InternalName", "shibsp1_4D\0"\r
#else\r
- VALUE "InternalName", "shibsp1_3\0"\r
+ VALUE "InternalName", "shibsp1_4\0"\r
#endif\r
#endif\r
VALUE "LegalCopyright", "Copyright © 2009 Internet2\0"\r
VALUE "LegalTrademarks", "\0"\r
#ifdef SHIBSP_LITE\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "shibsp-lite1_3D.dll\0"\r
+ VALUE "OriginalFilename", "shibsp-lite1_4D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "shibsp-lite1_3.dll\0"\r
+ VALUE "OriginalFilename", "shibsp-lite1_4.dll\0"\r
#endif\r
#else\r
#ifdef _DEBUG\r
- VALUE "OriginalFilename", "shibsp1_3D.dll\0"\r
+ VALUE "OriginalFilename", "shibsp1_4D.dll\0"\r
#else\r
- VALUE "OriginalFilename", "shibsp1_3.dll\0"\r
+ VALUE "OriginalFilename", "shibsp1_4.dll\0"\r
#endif\r
#endif\r
VALUE "PrivateBuild", "\0"\r
- VALUE "ProductName", "Shibboleth 2.3.1\0"\r
- VALUE "ProductVersion", "2, 3, 1, 0\0"\r
+ VALUE "ProductName", "Shibboleth 2.4\0"\r
+ VALUE "ProductVersion", "2, 4, 0, 0\0"\r
VALUE "SpecialBuild", "\0"\r
END\r
END\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1D.lib xerces-c_3D.lib xsec_1D.lib saml2D.lib xmltooling1D.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3D.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4D.dll"\r
LinkIncremental="2"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(ConfigurationName);..\..\cpp-xmltooling\$(ConfigurationName)"\r
SubSystem="2"\r
<Tool\r
Name="VCLinkerTool"\r
AdditionalDependencies="log4shib1.lib xerces-c_3.lib xsec_1.lib saml2.lib xmltooling1.lib wsock32.lib"\r
- OutputFile="$(OutDir)\$(ProjectName)1_3.dll"\r
+ OutputFile="$(OutDir)\$(ProjectName)1_4.dll"\r
LinkIncremental="1"\r
AdditionalLibraryDirectories="..\..\cpp-opensaml2\$(PlatformName)\$(ConfigurationName);..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)"\r
GenerateDebugInformation="true"\r
*/
#define SHIBSP_VERSION_MAJOR 1
-#define SHIBSP_VERSION_MINOR 3
-#define SHIBSP_VERSION_REVISION 1
+#define SHIBSP_VERSION_MINOR 4
+#define SHIBSP_VERSION_REVISION 0
/** DO NOT MODIFY BELOW THIS LINE */