summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2020-01-22 11:32:26 +0100
committerGitHub <noreply@github.com>2020-01-22 11:32:26 +0100
commitcb7bb9393707341beac8908db9c600080cc85fa3 (patch)
tree093ba1632ac06b59ec00d9101fd769447e177ea5
parent2826e4def8c00e55e78c60ea9c993ebee6a1da85 (diff)
parent413aacd92a52a8306e61909c9137d173714076f5 (diff)
downloadMPC-ACE+TAO-6_5_8.tar.gz
Merge pull request #94 from jwillemsen/jwi-openssl11ocitao22ap17ACE+TAO-6_5_8
Add openssl11=1 to Windows, vcpkg now has openssl 1.1.1
-rw-r--r--azure-pipelines.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index d8d62c70..000dc513 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -62,6 +62,7 @@ jobs:
- powershell: |
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+ echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
displayName: Create default.features file
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
@@ -108,6 +109,7 @@ jobs:
- powershell: |
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+ echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
displayName: Create default.features file
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
@@ -153,6 +155,7 @@ jobs:
- powershell: |
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
+ echo "openssl11=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
displayName: Create default.features file
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc