Changeset 664 for CMT/v1r25-branch/mgr/fragments/nmake

Timestamp:

Jan 13, 2014, 4:09:37 PM (10 years ago)

Author:

rybkin

Message:

merge -r 646:663 HEAD

Location:

CMT/v1r25-branch

Files:

• . (modified) (1 prop)
• mgr/fragments/nmake/check_application (modified) (1 prop)
• mgr/fragments/nmake/constituent (modified) (1 prop)
• mgr/fragments/nmake/constituent_lock (modified) (1 prop)
• mgr/fragments/nmake/jar (modified) (1 prop)
• mgr/fragments/nmake/java (modified) (1 prop)
• mgr/fragments/nmake/library (modified) (1 prop)
• mgr/fragments/nmake/library_no_static (modified) (1 prop)
• mgr/fragments/nmake/package (modified) (11 diffs)
• mgr/fragments/nmake/packages_header (modified) (1 diff)

CMT/v1r25-branch/mgr/fragments/nmake/package

@@ -1 +1 @@
 
+cmt_${PACKAGE}_${ISINCLUDED} = 1
 cmt_${PACKAGE}_${ISLOCAL} = 1
 
@@ -6 +7 @@
 
 !if "$(LOG_LOCATION)" != ""
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)\$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
@@ -11 +13 @@
 !if "$(BCAST_GLOBAL)" != ""
 ${PACKAGE}OutErr = >>$(LOG_LOCATION)\$(${PACKAGE}FullName)$(LOG_SUFFIX) 2>&1
+!endif
 !endif
 !endif
@@ -20 +23 @@
 ${PACKAGE} : $(${PACKAGE}MgrPath)\NMake
 !endif
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -73 +77 @@
 !endif
 !endif
+!else
+        
+!endif
 
 $(${PACKAGE}MgrPath)\NMake :
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         $(echo) configuring ${PACKAGE}
@@ -85 +93 @@
         
 !endif
+!endif
+!else
+        
 !endif
 
@@ -96 +107 @@
 
 ${PACKAGE}clean : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -125 +137 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}binclean : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -156 +172 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}uninstall : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -187 +207 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE}check : $(${PACKAGE}MgrPath)\NMake
+!if "$(cmt_${PACKAGE}_is_included)" != ""
 !if "$(cmt_${PACKAGE}_is_local)" != ""
         @echo "#--------------------------------------------------------------" \
@@ -218 +242 @@
 !endif
 !endif
+!else
+        
+!endif
 
 ${PACKAGE} ${PACKAGE}clean ${PACKAGE}binclean ${PACKAGE}uninstall ${PACKAGE}check : FORCE

CMT/v1r25-branch/mgr/fragments/nmake/packages_header

@@ -27 +27 @@
 #    ignore: try all the groups even if one fails before going to the next package
 #            (may result in duplicated errors within a package)
-# Unix version taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified)
+# Unix version taken from https://svnweb.cern.ch/trac/gaudi/browser/Gaudi/trunk/Makefile.cmt (Modified by Grigory Rybkin)
 Package_failure_handler = || exit
 !if "$(PACKAGE_FAILURE_POLICY)" != ""