Changeset 487 for CMT/HEAD/src

Timestamp:

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

Author:

rybkin

Message:

See C.L. 382

Location:

CMT/HEAD/src

Files:

• Makefile.header (modified) (9 diffs)
• NMakefile.header (modified) (3 diffs)

CMT/HEAD/src/Makefile.header

@@ -18 +18 @@
 tags      = $(tag),$(CMTEXTRATAGS)
 
-ifdef READONLY
-cmt_local_tagfile = /tmp/CMT_$(tag).make$$$$
-else
 cmt_local_tagfile = $(bin)$(tag).make
-endif
 
-ifdef READONLY
-cmt_constituents_makefile = /tmp/CMT_$(tag)_constituents.make$$$$
-else
 cmt_constituents_makefile = $(bin)constituents.make
-endif
+
+cmt_local_setup = $(bin)setup$$$$.make
+#cmt_local_setup = $(bin)$(package)setup$$$$.make
+#cmt_final_setup = $(bin)${PACKAGE}setup.make
+cmt_final_setup = $(bin)setup.make
+#cmt_final_setup = $(bin)$(package)setup.make
 
 #
@@ -42 +40 @@
         @$(cmtexe) check configuration; retval=$$?; \
         if test $${retval} = 0; then \
-          $(MAKE) --no-print-directory target="first config all" common_target; \
+          $(MAKE) --no-print-directory target="all" common_target; \
         else \
           echo "#CMT> There are configuration errors. Please correct them before running gmake"; \
@@ -48 +46 @@
 
 no_check_config ::
-        @$(MAKE) --no-print-directory target="first config all" common_target
+        @$(MAKE) --no-print-directory target="all" common_target
 
 binclean ::
@@ -54 +52 @@
           if test -d $(bin) ; then \
             test -z "$(cmtmsg)" || \
-            echo "$(CMTMSGPREFIX)" "(Makefile.header) Cleaning all from $(bin)"; \
+            echo "$(CMTMSGPREFIX)" "(Makefile.header) Removing binary directory $(bin)"; \
             /bin/rm -rf $(bin) ; \
           fi ; \
@@ -65 +63 @@
 .DEFAULT ::
         @$(cmtexe) check configuration
-        $(MAKE) --no-print-directory target="first config $@" common_target
+        @$(MAKE) --no-print-directory target="$@" common_target
 #       @$(MAKE) --no-print-directory target="config $@" common_target
 
@@ -71 +69 @@
 #  Capture all possible targets
 #
-ifdef READONLY
-common_target ::
-        @tmpdir=/tmp; \
-          if test ! "${TMPDIR}" = ""; then tmpdir=${TMPDIR}; fi; \
-          cmt_lock_pid=`mkdir -p $${tmpdir}; mktemp $${tmpdir}/CMT_XXXXXX | sed -e 's#'"$${tmpdir}"'/CMT_##'`; \
-          temp_marker=$${tmpdir}/CMT_$${cmt_lock_pid}; \
-          temp_lock=$${tmpdir}/CMT_lock$${cmt_lock_pid}.make; \
-          temp_constituents=$${tmpdir}/CMT_constituents$${cmt_lock_pid}; \
-          if test ! "${CMTMAKEDEBUG}" = 1; then\
-            trap '/bin/rm -f $${temp_lock} $${temp_constituents} $${temp_marker}; exit $${status}' 0 1 2 15; \
-          fi; \
-          /bin/rm -f $${temp_marker}; \
-          /bin/rm -f $${temp_lock}; \
-          echo "------> (Makefile.header) Rebuilding constituents.make"; \
-          $(cmtexe) -tag=$(tags) build constituents_makefile -out=$${temp_constituents}; status=$$?; \
-          if test $${status} = 0; then \
-            /bin/rm -f $(cmt_local_tagfile); \
-            $(MAKE) --no-print-directory -f $${temp_constituents} cmt_lock_pid=$${cmt_lock_pid} $(target); \
-            status=$$?; \
-          else \
-            echo "#CMT> Error generating constituents makefile"; \
-          fi; \
-          exit $${status}
-else
 common_target : $(cmt_constituents_makefile)
-        @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target)
-endif
+        @$(MAKE) --no-print-directory -f $(cmt_constituents_makefile) $(target)
+#       @$(MAKE) --no-print-directory -f $< cmt_lock_pid=$(cmt_lock_pid) $(target)
 
 $(cmt_constituents_makefile) : $(cmt_local_tagfile)
@@ -118 +92 @@
           if test ! -d $(@D); then $(mkdir) -p $(@D); fi; \
           $(cmtexe) -tag=$(tags) build tag_makefile >$@
+        $(echo) "(Makefile.header) Rebuilding $(cmt_final_setup)"; \
+          test ! -f $(cmt_local_setup) || \rm -f $(cmt_local_setup); \
+          trap '\rm -f $(cmt_local_setup)' 0 1 2 15; \
+          $(cmtexe) -tag=$(tags) show setup >$(cmt_local_setup) && \
+          if [ -f $(cmt_final_setup) ] && \
+            \cmp -s $(cmt_final_setup) $(cmt_local_setup); then \
+            \rm $(cmt_local_setup); else \
+            \mv -f $(cmt_local_setup) $(cmt_final_setup); fi
 
 #         && /bin/echo $@ ok   
@@ -147 +129 @@
         @echo 'clean       : remove everything that can be rebuilt'
         @echo 'binclean    : fast erase of the binary directory'
+        @echo 'uninstall   : remove everything installed in the installation area'
         @echo ' '
         @groups=`$(cmtexe) show groups -tag=$(tags)`; \
@@ -154 +137 @@
         @echo "Constituents:"; \
           for c in `$(cmtexe) show constituent_names -tag=$(tags)` ; do \
-            echo "  $${c}  $${c}clean"; \
+            echo "  $${c}  $${c}clean  $${c}uninstall"; \
           done
         @echo ' '

CMT/HEAD/src/NMakefile.header

@@ -43 +43 @@
         @echo --------------------------------------------------------------------------
         @echo You may select one of the following make targets :
-        @echo  
+        @echo.
         @echo help        : this help
         @echo all         : rebuild everything according to the $$(constituents) macro
         @echo               (this is the default target)
         @echo clean       : remove everything that can be rebuilt
-        @echo configclean : remove configuration files (*.nmake)
-        @echo  
+#       @echo configclean : remove configuration files (*.nmake)
+        @echo binclean    : fast erase of the binary directory
+        @echo uninstall   : remove everything installed in the installation area
+        @echo.
+        @for /F "usebackq" %%i in (`$(cmtexe) show groups -tag^=$(tags)`) do \
+          @echo %%i : rebuild all constituents of group %%i
+        @echo Constituents: & \
+          for /F "usebackq" %%i in (`$(cmtexe) show constituent_names -tag^=$(tags)`) do \
+            @echo   %%i  %%iclean  %%iuninstall
+        @echo.
         @echo check :
         @echo               run all applications defined with the -check option
-        @echo  
-        @echo everywhere [target=...] : 
-        @echo               o Rebuild on all plateforms specified in the $$(everywhere) macro
-        @echo               o Use "cmt show macro everywhere -tag=<site>" to check it
-        @echo               o The "target" option permits to transmit a target to the remote site
-
+        @echo.
+#       @echo everywhere [target=...] : 
+#       @echo               o Rebuild on all plateforms specified in the $$(everywhere) macro
+#       @echo               o Use "cmt show macro everywhere -tag=<site>" to check it
+#       @echo               o The "target" option permits to transmit a target to the remote site
 
 cmt_constituents_makefile = $(bin)constituents.nmake
@@ -66 +73 @@
 !ENDIF
 
-!if "$(QUICK)" == ""
+!if "$(QUICK)" == "" || !exist ($(cmt_constituents_makefile))
+
+!if [$(echo) (NMakefile.header) Rebuilding $(cmt_constituents_makefile)] == 0
+!endif
 !if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
 !endif
+
 !endif
 
@@ -75 +86 @@
 
 
-
-