Ignore:
Timestamp:
Jan 6, 2012, 3:57:31 PM (12 years ago)
Author:
rybkin
Message:

See C.L. 477

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMT/HEAD/mgr/fragments/nmake/packages_header

    r599 r600  
    99
    1010!if "$(LOG_LOCATION)" != ""
     11!if "$(LOG_SUFFIX)" == ""
    1112LOG_SUFFIX = .log
     13!endif
    1214!endif
    1315
     
    2628#            (may result in duplicated errors within a package)
    2729# Unix version taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified)
    28 Package_failure_handler = & if errorlevel 1 exit 1
     30Package_failure_handler = || exit
    2931!if "$(PACKAGE_FAILURE_POLICY)" != ""
    3032!if "$(PACKAGE_FAILURE_POLICY)" == "stop"
    31 Package_failure_handler = & if errorlevel 1 exit 1
     33Package_failure_handler = || exit
    3234!else if "$(PACKAGE_FAILURE_POLICY)" == "skip"
    33 Package_failure_handler = & if errorlevel 1 exit 0
     35Package_failure_handler = || exit 0
    3436!else if "$(PACKAGE_FAILURE_POLICY)" == "ignore"
    35 Package_failure_handler = & (if errorlevel 1 type nul > nul)
     37Package_failure_handler = || type nul > nul
    3638!else
    3739!error "Unknown PACKAGE_FAILURE_POLICY $(PACKAGE_FAILURE_POLICY). Allowed values: stop (default), skip, ignore"
Note: See TracChangeset for help on using the changeset viewer.