Changeset 547 for CMT/HEAD/mgr/fragments/nmake/constituent

Timestamp:

Aug 3, 2010, 5:11:00 PM (15 years ago)

Author:

rybkin

Message:

See C.L. 432

File:

• CMT/HEAD/mgr/fragments/nmake/constituent (modified) (3 diffs)

CMT/HEAD/mgr/fragments/nmake/constituent

@@ -19 +19 @@
 !endif
 
-!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
+#!if "$(QUICK)" == "" || !exist ($(cmt_local_tagfile_${CONSTITUENT}))
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
-!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
+#!if [cmt -tag=$(tags) $(${CONSTITUENT}_extratags) build tag_makefile >$(cmt_local_tagfile_${CONSTITUENT})] == 0
+#!endif
 
-!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
-!endif
-!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
-!endif
+#!if [$(echo) (constituents.nmake) Rebuilding $(cmt_final_setup_${CONSTITUENT})] == 0
+#!endif
+#!if [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_local_setup_${CONSTITUENT})] == 0
+#!endif
 
-!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
-!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
-!endif
-!else
-!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
-!endif
-!endif
+#!if exist ($(cmt_final_setup_${CONSTITUENT})) && [ echo n|comp $(cmt_final_setup_${CONSTITUENT}) $(cmt_local_setup_${CONSTITUENT}) >nul 2>&1 ] == 0
+#!if [ del $(cmt_local_setup_${CONSTITUENT}) ] == 0
+#!endif
+#!else
+#!if [ move /y $(cmt_local_setup_${CONSTITUENT}) $(cmt_final_setup_${CONSTITUENT}) >nul ] == 0
+#!endif
+#!endif
 
-!endif
+#!endif
 
 !else
@@ -52 +52 @@
 !endif
 
-!if "$(QUICK)" == ""
-$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
-!else
-$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-!endif
+#!if "$(QUICK)" == ""
+#$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT})
+#!else
+#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
+#!endif
+
+!if "$(QUICK)" == "" || !exist ($(cmt_local_${CONSTITUENT}_makefile)) || !exist ($(cmt_local_tagfile_${CONSTITUENT})) || !exist ($(cmt_final_setup_${CONSTITUENT}))
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies)
         $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
         @set include=$(include)
         @set lib=$(lib)
-        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
+        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$@ ${CONSTITUENT}
+#       @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
 #       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
+!else
+$(cmt_local_${CONSTITUENT}_makefile) : $(${CONSTITUENT}_dependencies) ;
+!endif
 
 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
@@ -104 +111 @@
 
 #${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
-${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+#${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
+${CONSTITUENT}uninstall ::
         $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
         @set include=$(include)
         @set lib=$(lib)
-        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+        @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_config -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
+#       @if not exist $(cmt_local_${CONSTITUENT}_makefile) $(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$(cmt_local_${CONSTITUENT}_makefile) ${CONSTITUENT}
         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
         $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done