From: Scott Cantor Date: Tue, 31 Jul 2012 02:14:14 +0000 (+0000) Subject: Add version resource to utilities X-Git-Tag: 2.5.0~17 X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=commitdiff_plain;h=e589f74f71c2d027004dd2909e68e6fb958de0b6 Add version resource to utilities --- diff --git a/Shibboleth.sln b/Shibboleth.sln index afcc275..05c545c 100644 --- a/Shibboleth.sln +++ b/Shibboleth.sln @@ -7,6 +7,7 @@ EndProject 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}" diff --git a/shibd/Makefile.am b/shibd/Makefile.am index f4d5f87..3d6521a 100644 --- a/shibd/Makefile.am +++ b/shibd/Makefile.am @@ -1,5 +1,3 @@ -## $Id$ - AUTOMAKE_OPTIONS = foreign sbin_PROGRAMS = shibd diff --git a/util/Makefile.am b/util/Makefile.am index 9a16904..b193a30 100644 --- a/util/Makefile.am +++ b/util/Makefile.am @@ -12,4 +12,8 @@ mdquery_SOURCES = mdquery.cpp 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 \ No newline at end of file diff --git a/util/mdquery.rc b/util/mdquery.rc new file mode 100644 index 0000000..64a9a93 --- /dev/null +++ b/util/mdquery.rc @@ -0,0 +1,109 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,0,0 + PRODUCTVERSION 2,5,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Metadata Query Utility\0" + VALUE "FileVersion", "2, 5, 0, 0\0" + VALUE "InternalName", "mdquery\0" + VALUE "LegalCopyright", "Copyright © 2012 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "mdquery.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.0\0" + VALUE "ProductVersion", "2, 5, 0, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/util/mdquery.vcxproj b/util/mdquery.vcxproj index 99c42cf..7026e7e 100644 --- a/util/mdquery.vcxproj +++ b/util/mdquery.vcxproj @@ -203,6 +203,12 @@ false + + + + + + diff --git a/util/resolvertest.rc b/util/resolvertest.rc new file mode 100644 index 0000000..a52845c --- /dev/null +++ b/util/resolvertest.rc @@ -0,0 +1,109 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifndef _MAC +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 2,5,0,0 + PRODUCTVERSION 2,5,0,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "Shibboleth Consortium\0" + VALUE "FileDescription", "Attribute Resolver Utility\0" + VALUE "FileVersion", "2, 5, 0, 0\0" + VALUE "InternalName", "resolvertest\0" + VALUE "LegalCopyright", "Copyright © 2012 UCAID\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename", "resolvertest.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "Shibboleth 2.5.0\0" + VALUE "ProductVersion", "2, 5, 0, 0\0" + VALUE "SpecialBuild", "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/util/resolvertest.vcxproj b/util/resolvertest.vcxproj index e9c0d15..8224e2e 100644 --- a/util/resolvertest.vcxproj +++ b/util/resolvertest.vcxproj @@ -205,6 +205,12 @@ false + + + + + + diff --git a/util/resource.h b/util/resource.h new file mode 100644 index 0000000..1818905 --- /dev/null +++ b/util/resource.h @@ -0,0 +1,35 @@ +/** + * Licensed to the University Corporation for Advanced Internet + * Development, Inc. (UCAID) under one or more contributor license + * agreements. See the NOTICE file distributed with this work for + * additional information regarding copyright ownership. + * + * UCAID licenses this file to you 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. + */ + +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by utility resource scripts +// + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1000 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif