- Timestamp:
- Jan 30, 2009, 1:54:39 PM (15 years ago)
- Location:
- CMT/HEAD
- Files:
-
- 1 added
- 24 edited
-
ChangeLog (modified) (1 diff)
-
mgr/cmt_format_deps.bat (modified) (1 diff)
-
mgr/fragments/constituent (modified) (1 diff)
-
mgr/fragments/constituent_lock (modified) (1 diff)
-
mgr/fragments/constituents_header (modified) (1 diff)
-
mgr/fragments/nmake/c (modified) (2 diffs)
-
mgr/fragments/nmake/c_library (modified) (2 diffs)
-
mgr/fragments/nmake/cmt_action_runner (added)
-
mgr/fragments/nmake/constituent (modified) (1 diff)
-
mgr/fragments/nmake/constituent_lock (modified) (1 diff)
-
mgr/fragments/nmake/constituents_trailer (modified) (2 diffs)
-
mgr/fragments/nmake/cpp (modified) (2 diffs)
-
mgr/fragments/nmake/cpp_library (modified) (2 diffs)
-
mgr/fragments/nmake/dependencies (modified) (1 diff)
-
mgr/fragments/nmake/fortran (modified) (1 diff)
-
mgr/fragments/nmake/fortran_library (modified) (1 diff)
-
mgr/fragments/nmake/lex (modified) (1 diff)
-
mgr/fragments/nmake/lex_library (modified) (1 diff)
-
mgr/fragments/nmake/make_header (modified) (2 diffs)
-
mgr/fragments/nmake/yacc (modified) (1 diff)
-
mgr/fragments/nmake/yacc_library (modified) (1 diff)
-
mgr/requirements (modified) (1 diff)
-
source/cmt_generator.cxx (modified) (2 diffs)
-
source/cmt_generator.h (modified) (1 diff)
-
source/cmt_generators.cxx (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CMT/HEAD/ChangeLog
r487 r488 1 2009-01-30 <rybkin@lal.in2p3.fr> 383 2 3 * source/cmt_generator.h: In class CmtGenerator, introuduce member 4 m_HASDEPENDENCIES 5 * source/cmt_generator.cxx: idem 6 * source/cmt_generators.cxx: Depending on whether the constituent needs 7 the generation of dependenicies, set m_HASDEPENDENCIES appropriately and 8 fill the makefiles fragments with the value 9 * mgr/fragments/nmake/constituent: Implement the generation of 10 dependenicies depending on the files modifications rather than every time 11 NMake is run 12 * mgr/fragments/nmake/constituent_lock: idem 13 * mgr/fragments/nmake/dependencies: idem 14 * mgr/fragments/nmake/cpp: idem 15 * mgr/fragments/nmake/cpp_library: idem 16 * mgr/fragments/nmake/c: idem 17 * mgr/fragments/nmake/c_library: idem 18 * mgr/fragments/nmake/fortran: idem 19 * mgr/fragments/nmake/fortran_library: idem 20 * mgr/fragments/nmake/yacc: idem 21 * mgr/fragments/nmake/yacc_library: idem 22 * mgr/fragments/nmake/lex: idem 23 * mgr/fragments/nmake/lex_library: idem 24 * mgr/fragments/nmake/make_header: idem 25 * mgr/fragments/nmake/constituents_trailer: Fix a typo 26 * mgr/fragments/nmake/cmt_action_runner: Introduce NMake version of the 27 file 28 * mgr/requirements: Under Windows, build the stamps files for dependencies 29 by default (as under Linux, Darwin) 30 * mgr/cmt_format_deps.bat: Use the type command to create the stamps files 31 * mgr/fragments/constituents_header: Introduce the makefiles target to only 32 build all the makefiles 33 * mgr/fragments/constituent: idem 34 * mgr/fragments/constituent_lock: idem 35 1 36 2009-01-08 <rybkin@lal.in2p3.fr> 382 2 37 -
CMT/HEAD/mgr/cmt_format_deps.bat
r483 r488 66 66 set tmp=%dep%.tmp 67 67 68 echo "">%stamptmp%68 type nul >%stamptmp% 69 69 if exist %tmp% del %tmp% 70 70 if not errorlevel 0 exit /b 1 -
CMT/HEAD/mgr/fragments/constituent
r487 r488 66 66 #endif 67 67 68 makefiles : $(cmt_local_${CONSTITUENT}_makefile) 69 68 70 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 69 71 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ -
CMT/HEAD/mgr/fragments/constituent_lock
r487 r488 66 66 #endif 67 67 68 makefiles : $(cmt_local_${CONSTITUENT}_makefile) 69 68 70 $(cmt_local_${CONSTITUENT}_makefile) : $(cmt_local_tagfile_${CONSTITUENT}) 69 71 $(echo) "(constituents.make) Building ${CONSTITUENT}.make"; \ -
CMT/HEAD/mgr/fragments/constituents_header
r487 r488 97 97 # $(build_library_links) 98 98 99 makefiles : ; 100 99 101 .DEFAULT :: 100 102 $(echo) "(constituents.make) $@: No rule for such target" >&2 -
CMT/HEAD/mgr/fragments/nmake/c
r487 r488 7 7 !endif 8 8 9 ${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 9 dependencies : $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 #${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 11 11 12 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d : $(use_requirements) $(cmt_final_setup_${CONSTITUENT}) … … 19 20 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : ${FULLNAME} 20 21 !else 22 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 23 21 24 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) 22 25 !endif -
CMT/HEAD/mgr/fragments/nmake/c_library
r487 r488 7 7 !endif 8 8 9 ${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 9 dependencies : $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 #${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 11 11 12 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d : $(use_requirements) $(cmt_final_setup_${CONSTITUENT}) … … 19 20 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : ${FULLNAME} 20 21 !else 22 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 23 21 24 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) 22 25 !endif -
CMT/HEAD/mgr/fragments/nmake/constituent
r487 r488 64 64 # $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done 65 65 66 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1 67 68 !if defined (cmt_${CONSTITUENT}_has_dependencies) 69 70 ${CONSTITUENT}dependencies : $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs 71 @set include=$(include) 72 @set lib=$(lib) 73 @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles dependencies tag=$(tag) 74 75 ${CONSTITUENT} :: ${CONSTITUENT}dependencies 76 !else 66 77 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs 78 !endif 67 79 $(echo) (constituents.nmake) Starting ${CONSTITUENT} 68 80 @set include=$(include) -
CMT/HEAD/mgr/fragments/nmake/constituent_lock
r487 r488 64 64 # $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done 65 65 66 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1 67 68 !if defined (cmt_${CONSTITUENT}_has_dependencies) 69 70 ${CONSTITUENT}dependencies : $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs 71 @set include=$(include) 72 @set lib=$(lib) 73 @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles dependencies tag=$(tag) 74 75 ${CONSTITUENT} :: ${CONSTITUENT}dependencies 76 !else 66 77 ${CONSTITUENT} :: $(${CONSTITUENT}_dependencies) $(cmt_local_${CONSTITUENT}_makefile) dirs 78 !endif 67 79 $(echo) (constituents.nmake) Creating ${CONSTITUENT}$(lock_suffix) 68 80 @$(lock_command) ${CONSTITUENT}$(lock_suffix) -
CMT/HEAD/mgr/fragments/nmake/constituents_trailer
r487 r488 4 4 5 5 remove_library_links :: 6 $(echo) "(constituents. make) Removing library links"6 $(echo) "(constituents.nmake) Removing library links" 7 7 @$(remove_library_links) 8 8 … … 16 16 #binclean :: clean 17 17 binclean :: 18 $(echo) (constituents. make) Removing binary directory $(bin)18 $(echo) (constituents.nmake) Removing binary directory $(bin) 19 19 $(cleanup_silent)if not "$(bin)"==".\" (if exist $(bin) rmdir /S /Q $(bin)) 20 20 # @del /Q $(bin)\* -
CMT/HEAD/mgr/fragments/nmake/cpp
r487 r488 7 7 !endif 8 8 9 ${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 9 dependencies : $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 #${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 11 11 12 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d : $(use_requirements) $(cmt_final_setup_${CONSTITUENT}) … … 19 20 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : ${FULLNAME} 20 21 !else 22 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 23 21 24 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) 22 25 !endif -
CMT/HEAD/mgr/fragments/nmake/cpp_library
r487 r488 7 7 !endif 8 8 9 ${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 9 dependencies : $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 #${CONSTITUENT} :: $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d 10 11 11 12 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.d : $(use_requirements) $(cmt_final_setup_${CONSTITUENT}) … … 19 20 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : ${FULLNAME} 20 21 !else 22 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 23 21 24 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) 22 25 !endif -
CMT/HEAD/mgr/fragments/nmake/dependencies
r487 r488 3 3 !if "$(QUICK)" == "" 4 4 5 !if exist ("$(CMTROOT)/$(CMTBIN)/cmt.exe") 6 !if [$(build_dependencies) ${CONSTITUENT} -all_sources -out:$(bin)${CONSTITUENT}_dependencies.nmake ${LINE}] == 0 7 !endif 8 !else 9 !if [echo no cmt $(CMTROOT)/$(CMTBIN)/cmt.exe] == 0 10 !endif 11 !endif 5 #!if exist ("$(CMTROOT)/$(CMTBIN)/cmt.exe") 6 #!if [$(build_dependencies) ${CONSTITUENT} -all_sources -out:$(bin)${CONSTITUENT}_dependencies.nmake ${LINE}] == 0 7 #!endif 8 #!else 9 #!if [echo no cmt $(CMTROOT)/$(CMTBIN)/cmt.exe] == 0 10 #!endif 11 #!endif 12 13 dependencies : $(bin)${CONSTITUENT}_dependencies.nmake 14 15 $(bin)${CONSTITUENT}_dependencies.nmake : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT}) 16 $(echo) (${CONSTITUENT}.nmake) Rebuilding $@ 17 $(build_dependencies) ${CONSTITUENT} -all_sources -out:$@ ${LINE} 12 18 13 19 !endif -
CMT/HEAD/mgr/fragments/nmake/fortran
r445 r488 1 1 #-- start of fortran ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/fragments/nmake/fortran_library
r445 r488 1 1 #-- start of fortran_library ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/fragments/nmake/lex
r459 r488 1 1 #-- start of lex ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/fragments/nmake/lex_library
r459 r488 1 1 #-- start of lex_library ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}\${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/fragments/nmake/make_header
r487 r488 48 48 !if defined (cmt_${CONSTITUENT}_has_target_tag) 49 49 50 cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}. make51 #cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}. make50 cmt_final_setup_${CONSTITUENT} = $(bin)setup_${CONSTITUENT}.nmake 51 #cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake 52 52 53 53 !else 54 54 55 cmt_final_setup_${CONSTITUENT} = $(bin)setup. make56 #cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}. make55 cmt_final_setup_${CONSTITUENT} = $(bin)setup.nmake 56 #cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake 57 57 58 58 !endif 59 59 60 #cmt_final_setup = $(bin)setup. make60 #cmt_final_setup = $(bin)setup.nmake 61 61 62 62 #${CONSTITUENT} :: … … 79 79 !endif 80 80 81 cmt_${CONSTITUENT}_${HASDEPENDENCIES} = 1 82 83 !if defined (cmt_${CONSTITUENT}_has_dependencies) 84 85 dependencies : ; 86 87 !endif 81 88 #-- end of make_header ------------------ -
CMT/HEAD/mgr/fragments/nmake/yacc
r459 r488 1 1 #-- start of yacc ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/fragments/nmake/yacc_library
r459 r488 1 1 #-- start of yacc_library ------ 2 3 $(bin)${CONSTITUENT}_dependencies.nmake : $(${NAME}_${FILESUFFIX}_dependencies) 2 4 3 5 $(bin)${CONSTITUENT}/${NAME}${CONSTITUENTSUFFIX}.obj : $(${NAME}_${FILESUFFIX}_dependencies) -
CMT/HEAD/mgr/requirements
r483 r488 433 433 Linux "${CMTROOT}/mgr/cmt_format_deps.sh" \ 434 434 Darwin "${CMTROOT}/mgr/cmt_format_deps.sh" \ 435 VisualC "%CMTROOT%\mgr\cmt_format_deps.bat /no_stamps"435 VisualC "%CMTROOT%\mgr\cmt_format_deps.bat" 436 436 437 437 macro implied_library_prefix "-l" \ -
CMT/HEAD/source/cmt_generator.cxx
r486 r488 84 84 m_USEINCLUDES.set ("USEINCLUDES"); 85 85 m_HASTARGETTAG.set ("HASTARGETTAG"); 86 m_HASDEPENDENCIES.set ("HASDEPENDENCIES"); 86 87 } 87 88 … … 122 123 m_USEINCLUDES = ""; 123 124 m_HASTARGETTAG = ""; 125 m_HASDEPENDENCIES = ""; 124 126 m_PACKINCLUDES = ""; 125 127 m_PACKOS9 = false; -
CMT/HEAD/source/cmt_generator.h
r483 r488 135 135 Variable m_USEINCLUDES; 136 136 Variable m_HASTARGETTAG; 137 Variable m_HASDEPENDENCIES; 137 138 }; 138 139 -
CMT/HEAD/source/cmt_generators.cxx
r486 r488 528 528 } 529 529 530 m_HASDEPENDENCIES = "has_dependencies"; 531 530 532 m_STRUCTURED_OUTPUT = "STRUCTURED_OUTPUT"; 531 533 532 make_header_fragment.copy (m_output_file, constituent.variables, 8,534 make_header_fragment.copy (m_output_file, constituent.variables, 9, 533 535 &m_TITLE, 534 536 &m_CONSTITUENT, … … 538 540 &m_PACKAGE, 539 541 &m_HASTARGETTAG, 542 &m_HASDEPENDENCIES, 540 543 &m_STRUCTURED_OUTPUT 541 544 ); … … 1021 1024 } 1022 1025 1023 make_header_fragment.copy (m_output_file, constituent.variables, 7, 1026 m_HASDEPENDENCIES = fragment.need_dependencies () ? "has_dependencies" : "has_no_dependencies" ; 1027 1028 make_header_fragment.copy (m_output_file, constituent.variables, 8, 1024 1029 &m_TITLE, 1025 1030 &m_CONSTITUENT, … … 1028 1033 &m_DATE, 1029 1034 &m_PACKAGE, 1030 &m_HASTARGETTAG); 1035 &m_HASTARGETTAG, 1036 &m_HASDEPENDENCIES 1037 ); 1031 1038 1032 1039 const cmt_string& header = fragment.header (); … … 2582 2589 } 2583 2590 2591 switch (constituent.type) 2592 { 2593 case Application: 2594 m_HASDEPENDENCIES = "has_dependencies"; 2595 break; 2596 case Library: 2597 m_HASDEPENDENCIES = "has_dependencies"; 2598 break; 2599 case Document: 2600 m_HASDEPENDENCIES = FragmentHandle (constituent.generator).need_dependencies () ? "has_dependencies" : "has_no_dependencies" ; 2601 break; 2602 } 2603 2584 2604 if (constituent.type == Document && lock == true) 2585 2605 { 2586 2606 constituent_lock_fragment.copy (m_output_file, constituent.variables, 2587 5,2607 6, 2588 2608 &m_PACKAGE, 2589 2609 &m_CONSTITUENT, 2590 2610 &m_CONSTITUENTSUFFIX, 2591 2611 &m_LINE, 2612 &m_HASDEPENDENCIES, 2592 2613 &m_HASTARGETTAG); 2593 2614 } … … 2595 2616 { 2596 2617 constituent_fragment.copy (m_output_file, constituent.variables, 2597 5,2618 6, 2598 2619 &m_PACKAGE, 2599 2620 &m_CONSTITUENT, 2600 2621 &m_CONSTITUENTSUFFIX, 2601 2622 &m_LINE, 2623 &m_HASDEPENDENCIES, 2602 2624 &m_HASTARGETTAG); 2603 2625 }
Note: See TracChangeset
for help on using the changeset viewer.
