Changeset 641 for CMT/v1r25-branch/mgr/fragments/nmake/constituent

Timestamp:

Jun 6, 2013, 4:13:52 PM (11 years ago)

Author:

rybkin

Message:

merge -r 630:631 HEAD mgr/fragments/nmake/constituent mgr/fragments/nmake/constituent_lock mgr/fragments/nmake/jar mgr/fragments/nmake/library mgr/fragments/nmake/library_no_static mgr/fragments/nmake/java mgr/fragments/constituent mgr/fragments/constituent_lock mgr/fragments/nmake/check_application mgr/cmt_dcc_version.sh

File:

• CMT/v1r25-branch/mgr/fragments/nmake/constituent (modified) (4 diffs, 1 prop)

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

@@ -2 +2 @@
 
 cmt_${CONSTITUENT}_${HASTARGETTAG} = 1
+cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
 
-#--------------------------------------------------------
+#----------------------------------------
 
 !if defined (cmt_${CONSTITUENT}_has_target_tag)
 
-#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.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
 
 ${CONSTITUENT}_extratags = -tag_add=target_${CONSTITUENT}
 
-#!if [if not exist $(bin) mkdir $(bin)] == 0
-#!endif
-
-#!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_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
-
-#!endif
-
 !else
 
-#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
 cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).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})
-#!else
-#$(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT})
-#!endif
 
 !if defined (cmt_${CONSTITUENT}_has_target_tag)
@@ -90 +54 @@
 !endif
 
-cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1
 
 !if defined (cmt_${CONSTITUENT}_has_dependencies)
@@ -109 +72 @@
         $(echo) (constituents.nmake) ${CONSTITUENT} done
 
-clean :: ${CONSTITUENT}clean
+clean :: ${CONSTITUENT}clean ;
 
 ${CONSTITUENT}clean :: $(${CONSTITUENT}clean_dependencies) ##$(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) (constituents.nmake) Starting ${CONSTITUENT}clean
+        $(echo) (constituents.nmake) Starting $@
         @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)
-        $(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 $@ tag=$(tag)
+        $(echo) (constituents.nmake) $@ done
 #       @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
 
-install :: ${CONSTITUENT}install
+install :: ${CONSTITUENT}install ;
 
 ${CONSTITUENT}install :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile)
-        $(echo) (constituents.nmake) Starting install ${CONSTITUENT}
+        $(echo) (constituents.nmake) Starting $@
         @set include=$(include)
         @set lib=$(lib)
-        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
-        $(echo) (constituents.nmake) install ${CONSTITUENT} done
+        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
+        $(echo) (constituents.nmake) $@ done
 
-uninstall :: ${CONSTITUENT}uninstall
+uninstall :: ${CONSTITUENT}uninstall ;
 
-#${CONSTITUENT}uninstall :: $(cmt_local_${CONSTITUENT}_makefile)
-#${CONSTITUENT}uninstall :: $(cmt_local_tagfile_${CONSTITUENT})
 ${CONSTITUENT}uninstall :: $(${CONSTITUENT}uninstall_dependencies)
-        $(echo) (constituents.nmake) Starting uninstall ${CONSTITUENT}
+        $(echo) (constituents.nmake) Starting $@
         @set include=$(include)
         @set lib=$(lib)
@@ -140 +101 @@
 #       @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
+        $(echo) (constituents.nmake) $@ done
 
 #-- end of constituent ------