[cpp-opensaml COMMIT] in /branches/REL_2/saml: saml.vcxproj saml.vcxproj.filters saml2/metadata/impl/FolderMetadataPr...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep 28 03:54:31 2011
New Revision: 676

URL: http://svn.shibboleth.net/view/cpp-opensaml?rev=676&view=rev
Log:
Ignore . and .. on Windows side, fix VS make

Modified:
    branches/REL_2/saml/saml.vcxproj
    branches/REL_2/saml/saml.vcxproj.filters
    branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp

Modified: branches/REL_2/saml/saml.vcxproj
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.vcxproj?rev=676&r1=675&r2=676&view=diff
==============================================================================
--- branches/REL_2/saml/saml.vcxproj (original)
+++ branches/REL_2/saml/saml.vcxproj Wed Sep 28 03:54:31 2011
@@ -177,6 +177,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="saml2\metadata\impl\DiscoverableMetadataProvider.cpp" />
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp" />
     <ClCompile Include="SAMLConfig.cpp" />
     <ClCompile Include="util\CommonDomainCookie.cpp" />
     <ClCompile Include="util\SAMLConstants.cpp" />

Modified: branches/REL_2/saml/saml.vcxproj.filters
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml.vcxproj.filters?rev=676&r1=675&r2=676&view=diff
==============================================================================
--- branches/REL_2/saml/saml.vcxproj.filters (original)
+++ branches/REL_2/saml/saml.vcxproj.filters Wed Sep 28 03:54:31 2011
@@ -362,6 +362,9 @@
     </ClCompile>
     <ClCompile Include="version.cpp">
       <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="saml2\metadata\impl\FolderMetadataProvider.cpp">
+      <Filter>Source Files\saml2\metadata\impl</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>

Modified: branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp
URL: http://svn.shibboleth.net/view/cpp-opensaml/branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp?rev=676&r1=675&r2=676&view=diff
==============================================================================
--- branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp (original)
+++ branches/REL_2/saml/saml2/metadata/impl/FolderMetadataProvider.cpp Wed Sep 28 03:54:31 2011
@@ -100,7 +100,8 @@
             }
             do {
                 if (f.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
-                    log.warn("nested folders not supported, skipping (%s)", f.cFileName);
+                    if (strcmp(f.cFileName, ".") && strcmp(f.cFileName, ".."))
+                        log.warn("nested folders not supported, skipping (%s)", f.cFileName);
                     continue;
                 }
                 fullname = loc + '/' + f.cFileName;