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

Timestamp:

Jan 8, 2009, 11:23:36 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 382

File:

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

CMT/HEAD/mgr/fragments/nmake/constituent

@@ -9 +9 @@
 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
+cmt_local_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake.tmp
+cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake
+#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
 
@@ -17 +19 @@
 !endif
 
-!if "$(QUICK)" == ""
+!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 [$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) show setup >$(cmt_final_setup_${CONSTITUENT})] == 0
+!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
 
@@ -31 +45 @@
 #cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
-cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
+#cmt_local_setup_${CONSTITUENT} = $(bin)setup.nmake.tmp
+cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake
+#cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
 cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
 
 !endif
 
-!if "$(QUICK)" == ""
-$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
-!else
-$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
-!endif
+#!if "$(QUICK)" == ""
+#$(cmt_local_${CONSTITUENT}_makefile) :: $(${CONSTITUENT}_dependencies) $(cmt_local_tagfile_${CONSTITUENT}) dirs
+#!else
+#$(cmt_local_${CONSTITUENT}_makefile) :: $(cmt_local_tagfile_${CONSTITUENT})
+#!endif
+$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
         $(echo) (constituents.nmake) Building ${CONSTITUENT}.nmake
         @set include=$(include)
         @set lib=$(lib)
         @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
-        $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
+#       $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
 
-${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
+${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs
         $(echo) (constituents.nmake) Starting ${CONSTITUENT}
         @set include=$(include)
@@ -56 +73 @@
 clean :: ${CONSTITUENT}clean
 
-${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
+#${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
+${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
         $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
         @set include=$(include)
         @set lib=$(lib)
-        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
+        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
         $(echo) (constituents.nmake) ${CONSTITUENT}clean done
+#       @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
+#       $(echo) (constituents.nmake) ${CONSTITUENT}clean done
 
 install :: ${CONSTITUENT}install
@@ -75 +95 @@
 
 ${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}"
+        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
         @set include=$(include)
         @set lib=$(lib)