projects / shibboleth / cpp-opensaml.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ec8536a)
Rev version and add README file.
authorScott Cantor <cantor.2@osu.edu>
Tue, 1 Jul 2008 17:38:01 +0000 (17:38 +0000)
committerScott Cantor <cantor.2@osu.edu>
Tue, 1 Jul 2008 17:38:01 +0000 (17:38 +0000)
.cproject patch | blob | history
configure.ac patch | blob | history
doc/Makefile.am patch | blob | history
doc/README.txt [new file with mode: 0644] patch | blob
opensaml.spec.in patch | blob | history
saml/saml.rc patch | blob | history
saml/saml.vcproj patch | blob | history
saml/version.h patch | blob | history

diff --git a/.cproject b/.cproject
index 9d80abc..afd8f07 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?><?fileVersion 4.0.0?><cproject>\r
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>\r
+<?fileVersion 4.0.0?>\r
+\r
+<cproject>\r
 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
 <cconfiguration id="converted.config.2133715230">\r
 <storageModule moduleId="scannerConfiguration">\r
 <storageModule moduleId="org.eclipse.cdt.core.settings">\r
 <cconfiguration id="converted.config.2133715230">\r
 <storageModule moduleId="scannerConfiguration">\r
@@ -55,6 +58,8 @@
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
 \r
 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>\r
 \r
 <storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>\r
+\r
+<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>\r
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">\r
 <pathentry kind="mac" name="_MSC_VER" path="" value=""/>\r
 <pathentry kind="mac" name="WIN32" path="" value=""/>\r
 <storageModule moduleId="org.eclipse.cdt.core.pathentry">\r
 <pathentry kind="mac" name="_MSC_VER" path="" value=""/>\r
 <pathentry kind="mac" name="WIN32" path="" value=""/>\r
@@ -62,6 +67,8 @@
 <pathentry include="C:/xml-security-c-1.4.0/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/log4shib-1.0/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/xml-security-c-1.4.0/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/log4shib-1.0/include" kind="inc" path="" system="true"/>\r
 <pathentry include="C:/cxxtest" kind="inc" path="" system="true"/>\r
+<pathentry base-path="cpp-xmltooling" include="" kind="inc" path="" system="true"/>\r
+<pathentry base-path="cpp-opensaml2" include="saml" kind="inc" path="" system="true"/>\r
 <pathentry kind="out" path=""/>\r
 <pathentry kind="out" path="debug"/>\r
 <pathentry kind="out" path="saml/Debug"/>\r
 <pathentry kind="out" path=""/>\r
 <pathentry kind="out" path="debug"/>\r
 <pathentry kind="out" path="saml/Debug"/>\r
diff --git a/configure.ac b/configure.ac
index fa0852d..ca3b886 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 AC_PREREQ([2.50])
 AC_PREREQ([2.50])
-AC_INIT([opensaml], [2.0.1], [mace-opensaml-users@internet2.edu], [saml])
+AC_INIT([opensaml], [2.1], [mace-opensaml-users@internet2.edu], [saml])
 AM_CONFIG_HEADER(config.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE([opensaml], [2.0.1])
+AM_INIT_AUTOMAKE([opensaml], [2.1])
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
 
 sinclude(doxygen.m4)
 sinclude(acx_pthread.m4)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f660d75..db6bd81 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 pkgdocdir = $(datadir)/doc/@PACKAGE@
 
 docfiles = \
 pkgdocdir = $(datadir)/doc/@PACKAGE@
 
 docfiles = \
+    README.txt \
        LICENSE.txt \
        NOTICE.txt \
        LOG4CPP.LICENSE
        LICENSE.txt \
        NOTICE.txt \
        LOG4CPP.LICENSE
diff --git a/doc/README.txt b/doc/README.txt
new file mode 100644 (file)
index 0000000..54030ac
--- /dev/null
+++ b/doc/README.txt
@@ -0,0 +1,16 @@
+VERSION 2.1\r
+\r
+Documentation:\r
+--------------\r
+The OpenSAML wiki is the home for any documentation.\r
+https://spaces.internet2.edu/display/OpenSAML/\r
+\r
+Reporting Bugs:\r
+---------------\r
+A Jira instance is available.\r
+https://bugs.internet2.edu/\r
+\r
+Support:\r
+--------\r
+A mailing list is available.\r
+https://spaces.internet2.edu/display/OpenSAML/MailingList\r
diff --git a/opensaml.spec.in b/opensaml.spec.in
index 9e4de4e..f8cbefb 100644 (file)
--- a/opensaml.spec.in
+++ b/opensaml.spec.in
@@ -10,7 +10,7 @@ Source0:      %{name}-%{version}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: xerces%{?xercesver}-c-devel >= 2.8.0
 BuildRequires:  xml-security-c-devel >= 1.4.0
-BuildRequires: xmltooling-devel
+BuildRequires: xmltooling-devel >= 1.1
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
 %{?_with_log4cpp:BuildRequires: log4cpp-devel >= 1.0}
 %{!?_with_log4cpp:BuildRequires: log4shib-devel}
 
@@ -75,6 +75,7 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
 %docdir %{_datadir}/doc/%{name}
 %dir %{_datadir}/xml/%{name}
 %{_datadir}/xml/%{name}
 %docdir %{_datadir}/doc/%{name}
+%{_datadir}/doc/%{name}/README.txt
 %{_datadir}/doc/%{name}/LICENSE.txt
 %{_datadir}/doc/%{name}/NOTICE.txt
 %{_datadir}/doc/%{name}/LOG4CPP.LICENSE
 %{_datadir}/doc/%{name}/LICENSE.txt
 %{_datadir}/doc/%{name}/NOTICE.txt
 %{_datadir}/doc/%{name}/LOG4CPP.LICENSE
@@ -89,6 +90,9 @@ find $RPM_BUILD_ROOT/%{_bindir} -type f |
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
 %doc %{_datadir}/doc/%{name}/api
 
 %changelog
+* Tue Jul 1 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.1-1
+- Bumping for minor update.
+
 * Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-6
 - Official release.
 
 * Mon Mar 17 2008  Scott Cantor  <cantor.2@osu.edu>  - 2.0-6
 - Official release.
 
diff --git a/saml/saml.rc b/saml/saml.rc
index 0a36262..725b529 100644 (file)
--- a/saml/saml.rc
+++ b/saml/saml.rc
@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 2,0,0,0\r
- PRODUCTVERSION 2,0,0,0\r
+ FILEVERSION 2,1,0,0\r
+ PRODUCTVERSION 2,1,0,0\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -46,23 +46,23 @@ BEGIN
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
         BEGIN\r
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "Internet2\0"\r
-            VALUE "FileDescription", "OpenSAML 2.0 Library\0"\r
-            VALUE "FileVersion", "2, 0, 0, 0\0"\r
+            VALUE "FileDescription", "OpenSAML 2.1 Library\0"\r
+            VALUE "FileVersion", "2, 1, 0, 0\0"\r
 #ifdef _DEBUG\r
 #ifdef _DEBUG\r
-            VALUE "InternalName", "saml2_0D\0"\r
+            VALUE "InternalName", "saml2_1D\0"\r
 #else\r
 #else\r
-            VALUE "InternalName", "saml2_0\0"\r
+            VALUE "InternalName", "saml2_1\0"\r
 #endif\r
 #endif\r
-            VALUE "LegalCopyright", "Copyright © 2007 Internet2\0"\r
+            VALUE "LegalCopyright", "Copyright © 2008 Internet2\0"\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
             VALUE "LegalTrademarks", "\0"\r
 #ifdef _DEBUG\r
-            VALUE "OriginalFilename", "saml2_0D.dll\0"\r
+            VALUE "OriginalFilename", "saml2_1D.dll\0"\r
 #else\r
 #else\r
-            VALUE "OriginalFilename", "saml2_0.dll\0"\r
+            VALUE "OriginalFilename", "saml2_1.dll\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
 #endif\r
             VALUE "PrivateBuild", "\0"\r
-            VALUE "ProductName", "OpenSAML 2.0\0"\r
-            VALUE "ProductVersion", "2, 0, 0, 0\0"\r
+            VALUE "ProductName", "OpenSAML 2.1\0"\r
+            VALUE "ProductVersion", "2, 1, 0, 0\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r
diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 724c6f3..82ece66 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -66,7 +66,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -142,7 +142,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -225,7 +225,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4shib1D.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
@@ -302,7 +302,7 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalDependencies="..\..\cpp-xmltooling\$(PlatformName)\$(ConfigurationName)\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4shib1.lib"\r
-                               OutputFile="$(OutDir)\$(ProjectName)2_0.dll"\r
+                               OutputFile="$(OutDir)\$(ProjectName)2_1.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r
                                SubSystem="2"\r
diff --git a/saml/version.h b/saml/version.h
index 4a02f1c..603a88d 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -38,8 +38,8 @@
  */
 
 #define OPENSAML_VERSION_MAJOR 2
  */
 
 #define OPENSAML_VERSION_MAJOR 2
-#define OPENSAML_VERSION_MINOR 0
-#define OPENSAML_VERSION_REVISION 1
+#define OPENSAML_VERSION_MINOR 1
+#define OPENSAML_VERSION_REVISION 0
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
 
 /** DO NOT MODIFY BELOW THIS LINE */
 
Unnamed repository; edit this file 'description' to name the repository.