equal
deleted
inserted
replaced
40 |
40 |
41 $ignoredFileName = "ignored_ctc.txt"; |
41 $ignoredFileName = "ignored_ctc.txt"; |
42 $ignoredmodeSourceRelative = "1"; |
42 $ignoredmodeSourceRelative = "1"; |
43 |
43 |
44 $coverageSymbols = "MON.sym"; |
44 $coverageSymbols = "MON.sym"; |
45 $ctcCommandPart1 = "ctcwrap -i d -n"; |
45 #$ctcCommandPart1 = "ctcwrap -i d -2comp -no-conf-check -n"; |
46 $ctcCommandPart2 = "abld build winscw udeb"; |
46 $ctcCommandPart1 = "ctcwrap -i d -2comp -n"; |
47 $ctcCommandPart2Test = "abld test build winscw udeb"; |
47 $ctcCommandPart2 = "sbs.bat -c winscw_udeb"; |
|
48 $ctcCommandPart2Test = "sbs -c winscw_udeb.test"; |
48 $ctcIgnoredPart1 = " -C \"EXCLUDE+"; |
49 $ctcIgnoredPart1 = " -C \"EXCLUDE+"; |
49 $ctcIgnoredPart2 = "\" "; |
50 $ctcIgnoredPart2 = "\" "; |
50 |
51 |
51 # from command line |
52 # from command line |
52 my ($param_noclean, |
53 my ($param_noclean, |
237 # do cleaning |
238 # do cleaning |
238 unlink("$eunitSrcDllLocation$currentDllNameLine"); |
239 unlink("$eunitSrcDllLocation$currentDllNameLine"); |
239 unlink("$eunitDstDllLocation$currentDllNameLine"); |
240 unlink("$eunitDstDllLocation$currentDllNameLine"); |
240 if ($currentBuildModeLine =~ /$eunitTestBuildMode/) |
241 if ($currentBuildModeLine =~ /$eunitTestBuildMode/) |
241 { |
242 { |
242 doSystemCall("abld test reallyclean winscw udeb "); |
243 doSystemCall("sbs -c winscw_udeb.test reallyclean "); |
243 } |
244 } |
244 else |
245 else |
245 { |
246 { |
246 doSystemCall("abld reallyclean winscw udeb "); |
247 #doSystemCall("sbs -c winscw_udeb reallyclean "); |
|
248 doSystemCall("sbs REALLYCLEAN "); |
247 } |
249 } |
248 } |
250 } |
249 else |
251 else |
250 { |
252 { |
251 print("no_cleanup param defined!\n"); |
253 print("no_cleanup param defined!\n"); |
265 print("previous dll was from same path - don't build again!\n"); |
267 print("previous dll was from same path - don't build again!\n"); |
266 } |
268 } |
267 else |
269 else |
268 { |
270 { |
269 print("previous dll was not from same path - build all!\n"); |
271 print("previous dll was not from same path - build all!\n"); |
270 doSystemCall("bldmake bldfiles"); |
|
271 |
272 |
272 if ($currentBuildModeLine =~ /$eunitTestBuildMode/) |
273 if ($currentBuildModeLine =~ /$eunitTestBuildMode/) |
273 { |
274 { |
274 doSystemCall("abld test reallyclean winscw udeb "); |
275 doSystemCall("sbs -c winscw_udeb.test reallyclean "); |
275 doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test"); |
276 doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2Test"); |
276 } |
277 } |
277 else |
278 else |
278 { |
279 { |
279 doSystemCall("abld reallyclean winscw udeb "); |
280 doSystemCall("sbs REALLYCLEAN "); |
280 doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2"); |
281 doSystemCall("$ctcCommandPart1 $coverageResultsDir$coverageSymbols $excludedCmd $ctcCommandPart2"); |
281 } |
282 } |
282 } |
283 } |
283 |
284 |
284 #copy test dll to correct location |
285 #copy test dll to correct location |