[cpp-sp] branch master updated: SSPCPP-802 Force the catalog update
Rod Widdowson
rdw at steadingsoftware.com
Mon May 21 10:51:34 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository cpp-sp.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=fb72064d20677902da1d41c99cefd69ea9c8168b
The following commit(s) were added to refs/heads/master by this push:
new fb72064 SSPCPP-802 Force the catalog update
fb72064 is described below
commit fb72064d20677902da1d41c99cefd69ea9c8168b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon May 21 15:48:11 2018 +0100
SSPCPP-802 Force the catalog update
https://issues.shibboleth.net/jira/browse/SSPCPP-802
Workaround a historical bug where the catalog files were under version rules
but also edited. This rendered them un-updatable, but we also need to keep
them under version rules (or they get deleted).
---
Projects/vc15/wix/Installer.vcxproj | 1 +
Projects/vc15/wix/MergeModules.vcxproj | 1 +
msi/WiX/MergeModules/OpenSAML-schemas.wxs | 12 ++++++++++++
msi/WiX/MergeModules/Shibboleth-schemas.wxs | 3 +++
msi/scripts/shib_edit_catalog.vbs | 13 +++++++------
5 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/Projects/vc15/wix/Installer.vcxproj b/Projects/vc15/wix/Installer.vcxproj
index b2d4fcb..a9cd917 100644
--- a/Projects/vc15/wix/Installer.vcxproj
+++ b/Projects/vc15/wix/Installer.vcxproj
@@ -81,6 +81,7 @@ nmake /f Installer.make BuildSP=$(BuildRoot) SolutionDir=$(SolutionDir)..\..\ Sh
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>
+ <None Include="..\..\..\msi\scripts\shib_edit_config_files.vbs-wix" />
<None Include="H:\Perforce\devel\cpp-sp\msi\wix\Dialog.bmp" />
<None Include="..\..\..\msi\wix\Installer.make" />
<None Include="..\..\..\msi\wix\license.rtf" />
diff --git a/Projects/vc15/wix/MergeModules.vcxproj b/Projects/vc15/wix/MergeModules.vcxproj
index 3cd5978..17284ca 100644
--- a/Projects/vc15/wix/MergeModules.vcxproj
+++ b/Projects/vc15/wix/MergeModules.vcxproj
@@ -93,6 +93,7 @@ nmake /f MergeModules.make BuildSP=$(BuildRoot) CurlVersion=$(CurlVersion) CurlF
<ItemDefinitionGroup>
</ItemDefinitionGroup>
<ItemGroup>
+ <None Include="..\..\..\msi\scripts\shib_edit_catalog.vbs" />
<None Include="..\..\..\msi\Wix\MergeModules\Curl-x64.wxs">
<SubType>Designer</SubType>
</None>
diff --git a/msi/WiX/MergeModules/OpenSAML-schemas.wxs b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
index 44767dc..645c54e 100644
--- a/msi/WiX/MergeModules/OpenSAML-schemas.wxs
+++ b/msi/WiX/MergeModules/OpenSAML-schemas.wxs
@@ -42,12 +42,21 @@
<Component Id="saml10_catalog.xml" Guid="{7E08BA59-AC67-4FEF-A3C4-DA01F59E16E0}">
<File KeyPath="yes" Name="saml10-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml10-catalog.xml.in" />
</Component>
+ <Component Id="saml10_catalog.xml.in" Guid="{A39E0CB9-2E80-4205-82F7-6A66E50D3B6E}">
+ <File KeyPath="yes" Name="saml10-catalog.xml.in" />
+ </Component>
<Component Id="saml11_catalog.xml" Guid="{4D599268-82B3-4C69-BB24-8E3D0FC79BE1}">
<File KeyPath="yes" Name="saml11-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml11-catalog.xml.in" />
</Component>
+ <Component Id="saml11_catalog.xml.in" Guid="{B804D093-7608-4D18-BEAE-C0FC65A43AB3}">
+ <File KeyPath="yes" Name="saml11-catalog.xml.in" />
+ </Component>
<Component Id="saml20_catalog.xml" Guid="{2A9829FE-518F-478B-B116-5B6A3087A6C9}">
<File KeyPath="yes" Name="saml20-catalog.xml" Source="$(var.SPBuildDirectory)\cpp-opensaml\schemas\saml20-catalog.xml.in" />
</Component>
+ <Component Id="saml20_catalog.xml.in" Guid="{EBFD82A6-8B4F-44F1-8304-254904E7E432}">
+ <File KeyPath="yes" Name="saml20-catalog.xml.in" />
+ </Component>
<Component Id="assertion_2.0.xsd" Guid="{6A785715-2E2E-4DFC-948B-94711E1DC355}">
<File KeyPath="yes" Id="assertion_2.0.xsd" Name="saml-schema-assertion-2.0.xsd" />
</Component>
@@ -209,6 +218,9 @@
<Component Id="catalog.xml" Guid="{CD84FD26-CCB0-4FC6-9B51-E72CC23046D8}">
<File KeyPath="yes" Name="catalog.xml" Source="$(var.SPBuildDirectory)\cpp-xmltooling\schemas\catalog.xml.in" />
</Component>
+ <Component Id="catalog.xml.in" Guid="{FE4B0B0F-0782-44C1-B8DB-AD4675D2C375}">
+ <File KeyPath="yes" Name="catalog.xml.in" />
+ </Component>
</Directory><!-- xmltooling -->
</Directory><!-- xml -->
</Directory><!-- SP -->
diff --git a/msi/WiX/MergeModules/Shibboleth-schemas.wxs b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
index 099a09b..044e512 100644
--- a/msi/WiX/MergeModules/Shibboleth-schemas.wxs
+++ b/msi/WiX/MergeModules/Shibboleth-schemas.wxs
@@ -28,6 +28,9 @@
<Component Id="catalog.xml" Guid="{C6EA59A2-0A86-4F5F-B5F8-E37A2310A793}">
<File KeyPath="yes" Name="catalog.xml" Source="$(var.SPBuildDirectory)\cpp-sp\schemas\catalog.xml.in" />
</Component>
+ <Component Id="catalog.xml.in" Guid="{0CC7F113-DC35-4A6F-8ECA-ED214B4BA720}">
+ <File KeyPath="yes" Name="catalog.xml.in" />
+ </Component>
<Component Id="shibboleth.xsd" Guid="{18F3DD83-0C0A-480E-8C87-043C9296DFE5}">
<File KeyPath="yes" Name="shibboleth.xsd" />
</Component>
diff --git a/msi/scripts/shib_edit_catalog.vbs b/msi/scripts/shib_edit_catalog.vbs
index 2b21bf5..7e074c4 100644
--- a/msi/scripts/shib_edit_catalog.vbs
+++ b/msi/scripts/shib_edit_catalog.vbs
@@ -3,6 +3,7 @@ Function ReadFile( filePath )
'OpenTextFile args: <path>, 1 = ForReading
'If you read an empty file, VBScript throws an error for some reason
+
if (FileSystemObj.FileExists(filePath)) then
Set theFile = FileSystemObj.GetFile(filePath)
if (theFile.size > 0) then
@@ -25,13 +26,15 @@ Sub WriteFile( filePath, contents )
End Sub
Sub ReplaceInFile( filePath, lookForStr, replaceWithStr )
- Dim buffer
+ Dim buffer
+ inpath = filePath & ".in"
- buffer = ReadFile(filePath)
+ buffer = ReadFile(inpath)
if (buffer <> "") then
buffer = Replace(buffer, lookForStr, replaceWithStr)
WriteFile filePath, buffer
- end if
+
+ end if
End Sub
@@ -40,14 +43,12 @@ Dim FileSystemObj, ConfigFile, ConfigFileName, XMLDir, WshShell
on error resume next
Set FileSystemObj = CreateObject("Scripting.FileSystemObject")
if (Err = 0) then
-
'Get the parameters via CustomActionData
customData = Session.Property("CustomActionData")
msiProperties = split(customData,";@;")
XMLDir = msiProperties(0) ' \programdata\shibboleth\sp\xml\opensaml\
ConfigFile = msiProperties(1) 'catalog
-
ReplaceInFile ConfigFile, "@-PKGXMLDIR-@/", XMLDir
'Last End If
-End If
\ No newline at end of file
+End If
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list