Skip to content

Commit 2826e4d

Browse files
jwillemsenjwillemsen
authored
Merge pull request DOCGroup#93 from jwillemsen/jwi-azurepath
Updated CI builds to reflect that core mwc is in the CIAO_ROOT directory
2 parents 9d7b99f + 4182dd4 commit 2826e4d

File tree

1 file changed

+18
-87
lines changed

1 file changed

+18
-87
lines changed

‎azure-pipelines.yml‎

Lines changed: 18 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,12 @@ jobs:
3333
vcpkgarch: x64-windows
3434
vcpkglibdir: debug\lib
3535
vcpkgpackages: openssl xerces-c
36-
Release64:
37-
BuildPlatform: x64
38-
BuildConfiguration: Release
39-
vcpkgarch: x64-windows
40-
vcpkglibdir: lib
41-
vcpkgpackages: openssl xerces-c
4236
Debug32:
4337
BuildPlatform: Win32
4438
BuildConfiguration: Debug
4539
vcpkgarch: x86-windows
4640
vcpkglibdir: debug\lib
4741
vcpkgpackages: openssl xerces-c
48-
Release32:
49-
BuildPlatform: Win32
50-
BuildConfiguration: Release
51-
vcpkgarch: x86-windows
52-
vcpkglibdir: lib
53-
vcpkgpackages: openssl xerces-c
5442
variables:
5543
VCPKG_ROOT: $(Build.SourcesDirectory)\vcpkg
5644
XERCESC_INCDIR: $(VCPKG_ROOT)\installed\$(vcpkgarch)\include
@@ -75,12 +63,12 @@ jobs:
7563
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
7664
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
7765
displayName: Create default.features file
78-
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 CIAO_TAO_DAnCE.mwc -workers 4
79-
displayName: Run script mwc.pl on CIAO_TAO_DAnCE.mwc
66+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
67+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
8068
- task: VSBuild@1
81-
displayName: Build solution CIAO_TAO_DAnCE.sln
69+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
8270
inputs:
83-
solution: CIAO_TAO_DAnCE.sln
71+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
8472
platform: $(BuildPlatform)
8573
configuration: $(BuildConfiguration)
8674
maximumCpuCount: true
@@ -91,12 +79,6 @@ jobs:
9179
vmImage: vs2017-win2016
9280
strategy:
9381
matrix:
94-
Debug64:
95-
BuildPlatform: x64
96-
BuildConfiguration: Debug
97-
vcpkgarch: x64-windows
98-
vcpkglibdir: debug\lib
99-
vcpkgpackages: openssl xerces-c
10082
Release64:
10183
BuildPlatform: x64
10284
BuildConfiguration: Release
@@ -127,12 +109,12 @@ jobs:
127109
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
128110
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
129111
displayName: Create default.features file
130-
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 CIAO_TAO_DAnCE.mwc -workers 4
131-
displayName: Run script mwc.pl on CIAO_TAO_DAnCE.mwc
112+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
113+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
132114
- task: VSBuild@1
133-
displayName: Build solution CIAO_TAO_DAnCE.sln
115+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
134116
inputs:
135-
solution: CIAO_TAO_DAnCE.sln
117+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
136118
platform: $(BuildPlatform)
137119
configuration: $(BuildConfiguration)
138120
maximumCpuCount: true
@@ -143,11 +125,6 @@ jobs:
143125
vmImage: vs2015-win2012r2
144126
strategy:
145127
matrix:
146-
Debug64:
147-
BuildPlatform: x64
148-
BuildConfiguration: Debug
149-
vcpkgarch: x64-windows
150-
vcpkglibdir: debug\lib
151128
Release64:
152129
BuildPlatform: x64
153130
BuildConfiguration: Release
@@ -177,12 +154,12 @@ jobs:
177154
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
178155
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
179156
displayName: Create default.features file
180-
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 CIAO_TAO_DAnCE.mwc -workers 4
181-
displayName: Run script mwc.pl on CIAO_TAO_DAnCE.mwc
157+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
158+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
182159
- task: VSBuild@1
183-
displayName: Build solution CIAO_TAO_DAnCE.sln
160+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
184161
inputs:
185-
solution: CIAO_TAO_DAnCE.sln
162+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
186163
platform: $(BuildPlatform)
187164
configuration: $(BuildConfiguration)
188165
maximumCpuCount: true
@@ -192,57 +169,11 @@ jobs:
192169
vmImage: ubuntu-latest
193170
strategy:
194171
matrix:
195-
GCC48:
196-
CC: gcc-4.8
197-
CXX: g++-4.8
198-
PackageDeps: g++-4.8
199-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
200-
GCC6:
201-
CC: gcc-6
202-
CXX: g++-6
203-
PackageDeps: g++-6
204-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
205-
GCC7:
206-
CC: gcc-7
207-
CXX: g++-7
208-
PackageDeps: g++-7
209-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
210-
GCC8:
211-
CC: gcc-8
212-
CXX: g++-8
213-
PackageDeps: g++-8
214-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
215172
GCC9:
216173
CC: gcc-9
217174
CXX: g++-9
218175
PackageDeps: g++-9
219176
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
220-
CLANG5:
221-
CC: clang-5.0
222-
CXX: clang++-5.0
223-
PackageDeps: clang-5.0
224-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
225-
CLANG6:
226-
CC: clang-6.0
227-
CXX: clang++-6.0
228-
PackageDeps: clang-6.0
229-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
230-
CLANG7:
231-
CC: clang-7
232-
CXX: clang++-7
233-
PackageDeps: clang-7
234-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
235-
CLANG8:
236-
CC: clang-8
237-
CXX: clang++-8
238-
PackageDeps: clang-8
239-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
240-
CLANG9:
241-
CC: clang-9
242-
CXX: clang++-9
243-
PackageDeps: clang-9
244-
Repo: llvm-toolchain-$(lsb_release -cs)-9
245-
platform_file: include $(ACE_ROOT)/include/makeinclude/platform_linux_clang.GNU
246177
steps:
247178
- script: |
248179
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
@@ -274,9 +205,9 @@ jobs:
274205
'dds4ccm_opendds=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
275206
"$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
276207
displayName: Create platform_macros file
277-
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace CIAO_TAO_DAnCE_OpenDDS.mwc -workers 4
278-
displayName: Run mwc.pl on CIAO_TAO_DAnCE_OpenDDS.mwc
279-
- bash: make -j 6
208+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(CIAO_ROOT)/CIAO_TAO_DAnCE_OpenDDS.mwc -workers 4
209+
displayName: Run mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE_OpenDDS.mwc
210+
- bash: make -j 6 -C $(CIAO_ROOT)
280211
displayName: Build project
281212

282213
- job: MacOSX
@@ -293,7 +224,7 @@ jobs:
293224
- powershell: |
294225
'include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU;
295226
displayName: Create platform_macros file
296-
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace CIAO_TAO_DAnCE.mwc -workers 4
297-
displayName: Run mwc.pl on CIAO_TAO_DAnCE.mwc
298-
- bash: make -j 6
227+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
228+
displayName: Run mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
229+
- bash: make -j 6 -C $(CIAO_ROOT)
299230
displayName: Build project

0 commit comments

Comments
 (0)