santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scan...@apache.org
Subject svn commit: r1002792 - in /santuario/trunk/c: Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj include/Makefile.am lib/Makefile.am src/framework/XSECVersion.hpp src/framework/XSECW32Config.hpp
Date Wed, 29 Sep 2010 18:04:08 GMT
Author: scantor
Date: Wed Sep 29 18:04:08 2010
New Revision: 1002792

URL: http://svn.apache.org/viewvc?rev=1002792&view=rev
Log:
Factor version decls into new header.

Added:
    santuario/trunk/c/src/framework/XSECVersion.hpp   (with props)
Modified:
    santuario/trunk/c/Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj
    santuario/trunk/c/include/Makefile.am
    santuario/trunk/c/lib/Makefile.am
    santuario/trunk/c/src/framework/XSECW32Config.hpp

Modified: santuario/trunk/c/Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj
URL: http://svn.apache.org/viewvc/santuario/trunk/c/Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj?rev=1002792&r1=1002791&r2=1002792&view=diff
==============================================================================
--- santuario/trunk/c/Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj (original)
+++ santuario/trunk/c/Projects/VC10.0/xsec/xsec_lib/xsec_lib.vcxproj Wed Sep 29 18:04:08 2010
@@ -667,6 +667,7 @@ xcopy /I /s /f ..\..\..\..\src\*.hpp ..\
     <ClInclude Include="..\..\..\..\src\enc\NSS\NSSCryptoProvider.hpp" />
     <ClInclude Include="..\..\..\..\src\enc\NSS\NSSCryptoSymmetricKey.hpp" />
     <ClInclude Include="..\..\..\..\src\enc\NSS\NSSCryptoX509.hpp" />
+    <ClInclude Include="..\..\..\..\src\framework\XSECVersion.hpp" />
     <ClInclude Include="..\..\..\..\src\utils\XSECAutoPtr.hpp" />
     <ClInclude Include="..\..\..\..\src\utils\XSECBinTXFMInputStream.hpp" />
     <ClInclude Include="..\..\..\..\src\utils\XSECDOMUtils.hpp" />

Modified: santuario/trunk/c/include/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/trunk/c/include/Makefile.am?rev=1002792&r1=1002791&r2=1002792&view=diff
==============================================================================
--- santuario/trunk/c/include/Makefile.am (original)
+++ santuario/trunk/c/include/Makefile.am Wed Sep 29 18:04:08 2010
@@ -119,7 +119,8 @@ lib_includes += \
   xsec/framework/XSECConfig.hpp \
   xsec/framework/XSECURIResolverXerces.hpp \
   xsec/framework/XSECAlgorithmMapper.hpp \
-  xsec/framework/XSECW32Config.hpp
+  xsec/framework/XSECW32Config.hpp \
+  xsec/framework/XSECVersion.hpp
 
 # transformers
 

Modified: santuario/trunk/c/lib/Makefile.am
URL: http://svn.apache.org/viewvc/santuario/trunk/c/lib/Makefile.am?rev=1002792&r1=1002791&r2=1002792&view=diff
==============================================================================
--- santuario/trunk/c/lib/Makefile.am (original)
+++ santuario/trunk/c/lib/Makefile.am Wed Sep 29 18:04:08 2010
@@ -167,6 +167,7 @@ framework_sources = \
   ../src/framework/XSECEnv.cpp \
   ../src/framework/XSECURIResolverXerces.hpp \
   ../src/framework/XSECW32Config.hpp \
+  ../src/framework/XSECVersion.hpp \
   ../src/framework/XSECProvider.hpp \
   ../src/framework/XSECAlgorithmHandler.hpp \
   ../src/framework/XSECConfig.hpp \

Added: santuario/trunk/c/src/framework/XSECVersion.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/framework/XSECVersion.hpp?rev=1002792&view=auto
==============================================================================
--- santuario/trunk/c/src/framework/XSECVersion.hpp (added)
+++ santuario/trunk/c/src/framework/XSECVersion.hpp Wed Sep 29 18:04:08 2010
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+/*
+ * XSECVersion.hpp
+ * 
+ * Version information for the package
+ */
+
+/*
+ * These are the high level numerics that need to be changed to bump the
+ * version number. They are used to create version strings.
+ */
+
+#define XSEC_VERSION_MAJOR   1
+#define XSEC_VERSION_MEDIUM  6
+#define XSEC_VERSION_MINOR   0
+
+// --------------------------------------------------------------------------------
+//           Version Handling
+// --------------------------------------------------------------------------------
+
+/*
+ * The following code makes use of the Xerces version handling macros to define
+ * some constants that can be used during conditional compilation.
+ */
+
+/* This can be used for conditional compilation and for testing during
+ * autoconfigures.
+ *
+ * It will create a string of the form 10000 * MAJOR + 100 * MEDIUM + MINOR
+ * E.g. 10301 for version 1.3.1
+ */
+
+#define _XSEC_VERSION_FULL CALC_EXPANDED_FORM (XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
+
+/* Some useful strings for versioning - based on the same strings from Xerces */
+
+#define XSEC_FULLVERSIONSTR INVK_CAT3_SEP_UNDERSCORE(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
+#define XSEC_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
+#define XSEC_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
+#define XSEC_VERSIONSTR     INVK_CAT2_SEP_UNDERSCORE(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM)
+
+/* The following is used for backwards compatibility with previous version handling */
+
+#define XSEC_VERSION         "XSEC_FULLVERSIONDOT"

Propchange: santuario/trunk/c/src/framework/XSECVersion.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: santuario/trunk/c/src/framework/XSECVersion.hpp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: santuario/trunk/c/src/framework/XSECW32Config.hpp
URL: http://svn.apache.org/viewvc/santuario/trunk/c/src/framework/XSECW32Config.hpp?rev=1002792&r1=1002791&r2=1002792&view=diff
==============================================================================
--- santuario/trunk/c/src/framework/XSECW32Config.hpp (original)
+++ santuario/trunk/c/src/framework/XSECW32Config.hpp Wed Sep 29 18:04:08 2010
@@ -30,17 +30,6 @@
 #include <xercesc/util/XercesVersion.hpp>
 
 /*
- * These are the high level numerics that need to be changed to bump the
- * version number.
- *
- * They are used to create version strings - see the details at the end of this file
- */
-
-#define XSEC_VERSION_MAJOR   1
-#define XSEC_VERSION_MEDIUM  6
-#define XSEC_VERSION_MINOR   0
-
-/*
  * Because we don't have a configure script, we need to rely on version
  * numbers to understand library idiosycracies
  */
@@ -216,33 +205,4 @@
 /* Windows direct.h */
 #define HAVE_DIRECT_H 1
 
-// --------------------------------------------------------------------------------
-//           Version Handling
-// --------------------------------------------------------------------------------
-
-/*
- * The following code makes use of the Xerces version handling macros to define
- * some constants that can be used during conditional compilation.
- */
-
-/* This can be used for conditional compilation and for testing during
- * autoconfigures.
- *
- * It will create a string of the form 10000 * MAJOR + 100 * MEDIUM + MINOR
- * E.g. 10301 for version 1.3.1
- */
-
-#define _XSEC_VERSION_FULL CALC_EXPANDED_FORM (XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
-
-/* Some useful strings for versioning - based on the same strings from Xerces */
-
-#define XSEC_FULLVERSIONSTR INVK_CAT3_SEP_UNDERSCORE(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
-#define XSEC_FULLVERSIONDOT INVK_CAT3_SEP_PERIOD(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
-#define XSEC_FULLVERSIONNUM INVK_CAT3_SEP_NIL(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM,XSEC_VERSION_MINOR)
-#define XSEC_VERSIONSTR     INVK_CAT2_SEP_UNDERSCORE(XSEC_VERSION_MAJOR,XSEC_VERSION_MEDIUM)
-
-/* The following is used for backwards compatibility with previous version handling */
-
-#define XSEC_VERSION	     "XSEC_FULLVERSIONDOT"
-
-
+#include <xsec/framework/XSECVersion.hpp>



Mime
View raw message