projects
/
shibboleth
/
cpp-sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Exbed parameterization into a common header (prior to eventual movement into a .wixpr...
[shibboleth/cpp-sp.git]
/
msi
/
WiX
/
MergeModules
/
OpenSAML-x64.wxs
diff --git
a/msi/WiX/MergeModules/OpenSAML-x64.wxs
b/msi/WiX/MergeModules/OpenSAML-x64.wxs
index
363cd39
..
b3ddd1e
100644
(file)
--- a/
msi/WiX/MergeModules/OpenSAML-x64.wxs
+++ b/
msi/WiX/MergeModules/OpenSAML-x64.wxs
@@
-16,9
+16,7
@@
implied. See the License for the specific language governing
\r
permissions and limitations under the License. -->
\r
\r
implied. See the License for the specific language governing
\r
permissions and limitations under the License. -->
\r
\r
-<?define BuildDirectory='G:\Downloads\shib\' ?>
\r
-<?define OpenSAMLVersion='2.4.3' ?>
\r
-<?define OpenSAMLFileVersion='2_4' ?>
\r
+<?include ..\Versions.wxi ?>
\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
\r
<Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
\r
\r
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
\r
<Module Id='OpenSAMLMergeModule_x64' Language='1033' Version='$(var.OpenSAMLVersion)'>
\r