Skip to content

Commit eb30af0

Browse files
committed
Updated CI builds to reflect that core mwc is in the CIAO_ROOT directory
* azure-pipelines.yml:
1 parent a4658dc commit eb30af0

File tree

1 file changed

+18
-18
lines changed

1 file changed

+18
-18
lines changed

azure-pipelines.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ jobs:
7575
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
7676
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
7777
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
78+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2019 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
79+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
8080
- task: VSBuild@1
81-
displayName: Build solution CIAO_TAO_DAnCE.sln
81+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
8282
inputs:
83-
solution: CIAO_TAO_DAnCE.sln
83+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
8484
platform: $(BuildPlatform)
8585
configuration: $(BuildConfiguration)
8686
maximumCpuCount: true
@@ -127,12 +127,12 @@ jobs:
127127
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
128128
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
129129
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
130+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vs2017 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
131+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
132132
- task: VSBuild@1
133-
displayName: Build solution CIAO_TAO_DAnCE.sln
133+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
134134
inputs:
135-
solution: CIAO_TAO_DAnCE.sln
135+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
136136
platform: $(BuildPlatform)
137137
configuration: $(BuildConfiguration)
138138
maximumCpuCount: true
@@ -177,12 +177,12 @@ jobs:
177177
echo "xerces3=1" | out-file -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
178178
echo "ssl=1" | out-file -append -encoding ASCII $(ACE_ROOT)\bin\MakeProjectCreator\config\default.features
179179
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
180+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type vc14 $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
181+
displayName: Run script mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
182182
- task: VSBuild@1
183-
displayName: Build solution CIAO_TAO_DAnCE.sln
183+
displayName: Build solution $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
184184
inputs:
185-
solution: CIAO_TAO_DAnCE.sln
185+
solution: $(CIAO_ROOT)/CIAO_TAO_DAnCE.sln
186186
platform: $(BuildPlatform)
187187
configuration: $(BuildConfiguration)
188188
maximumCpuCount: true
@@ -274,9 +274,9 @@ jobs:
274274
'dds4ccm_opendds=1' >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
275275
"$(platform_file)" >> $(ACE_ROOT)/include/makeinclude/platform_macros.GNU
276276
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
277+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(CIAO_ROOT)/CIAO_TAO_DAnCE_OpenDDS.mwc -workers 4
278+
displayName: Run mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE_OpenDDS.mwc
279+
- bash: make -j 6 -C $(CIAO_ROOT)
280280
displayName: Build project
281281

282282
- job: MacOSX
@@ -293,7 +293,7 @@ jobs:
293293
- powershell: |
294294
'include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU' > $(ACE_ROOT)/include/makeinclude/platform_macros.GNU;
295295
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
296+
- powershell: perl $(ACE_ROOT)/bin/mwc.pl -type gnuace $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc -workers 4
297+
displayName: Run mwc.pl on $(CIAO_ROOT)/CIAO_TAO_DAnCE.mwc
298+
- bash: make -j 6 -C $(CIAO_ROOT)
299299
displayName: Build project

0 commit comments

Comments
 (0)