[cpp-sp COMMIT] in /branches/REL_2: .gitignore Shibboleth.sln shibd/Makefile.am util/Makefile.am util/mdquery.rc util...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jul 30 22:14:14 2012
New Revision: 3740

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3740&view=rev
Log:
Add version resource to utilities

Added:
    branches/REL_2/util/mdquery.rc
    branches/REL_2/util/resolvertest.rc
    branches/REL_2/util/resource.h
Modified:
    branches/REL_2/.gitignore
    branches/REL_2/Shibboleth.sln
    branches/REL_2/shibd/Makefile.am
    branches/REL_2/util/Makefile.am
    branches/REL_2/util/mdquery.vcxproj
    branches/REL_2/util/resolvertest.vcxproj

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Mon Jul 30 22:14:14 2012
@@ -234,6 +234,7 @@
 # /util/
 /util/Debug
 /util/*.user
+/util/*.aps
 /util/Release
 /util/x64
 /util/.deps

Modified: branches/REL_2/Shibboleth.sln
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/Shibboleth.sln?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/Shibboleth.sln (original)
+++ branches/REL_2/Shibboleth.sln Mon Jul 30 22:14:14 2012
@@ -7,6 +7,7 @@
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{FED80230-119E-4B2F-9F53-D2660A5F022B}"
 	ProjectSection(SolutionItems) = preProject
 		util\Makefile.am = util\Makefile.am
+		util\resource.h = util\resource.h
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fastcgi", "fastcgi", "{8E1AF2CF-24E1-4983-8681-394D89DF9AD2}"

Modified: branches/REL_2/shibd/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibd/Makefile.am?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/shibd/Makefile.am (original)
+++ branches/REL_2/shibd/Makefile.am Mon Jul 30 22:14:14 2012
@@ -1,5 +1,3 @@
-## $Id$
-
 AUTOMAKE_OPTIONS = foreign
 
 sbin_PROGRAMS = shibd

Modified: branches/REL_2/util/Makefile.am
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/util/Makefile.am?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/util/Makefile.am (original)
+++ branches/REL_2/util/Makefile.am Mon Jul 30 22:14:14 2012
@@ -12,4 +12,8 @@
 mdquery_LDADD = $(XMLSEC_LIBS) \
 	$(top_builddir)/shibsp/libshibsp.la
 
-EXTRA_DIST = mdquery.vcxproj resolvertest.vcxproj
+EXTRA_DIST = mdquery.vcxproj \
+	resolvertest.vcxproj \
+	resource.h \
+	mdquery.rc \
+	resolvertest.rc

Modified: branches/REL_2/util/mdquery.vcxproj
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/util/mdquery.vcxproj?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/util/mdquery.vcxproj (original)
+++ branches/REL_2/util/mdquery.vcxproj Mon Jul 30 22:14:14 2012
@@ -203,6 +203,12 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="mdquery.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

Modified: branches/REL_2/util/resolvertest.vcxproj
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/util/resolvertest.vcxproj?rev=3740&r1=3739&r2=3740&view=diff
==============================================================================
--- branches/REL_2/util/resolvertest.vcxproj (original)
+++ branches/REL_2/util/resolvertest.vcxproj Mon Jul 30 22:14:14 2012
@@ -205,6 +205,12 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="resolvertest.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>