Changeset 469 for CMT


Ignore:
Timestamp:
Oct 29, 2008, 11:34:56 AM (16 years ago)
Author:
rybkin
Message:

See C.L. 370

Location:
CMT/HEAD
Files:
30 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r468 r469  
     12008-10-29    <rybkin@lal.in2p3.fr> 370
     2       
     3        * source/cmt_parser.cxx: In function fill_for_branches, generate the BIN
     4        macro to hold an absolute path for the path specified by the bin macro
     5        (both are file separator terminated)
     6        * source/cmt_generators.cxx: In function DependencyGenerator::build,
     7        implement the -out=file option of the cmt build dependencies command,
     8        do not read the existing dependency file (if any) with the -all_sources
     9        option
     10        * mgr/fragments/dependencies: Make use of the -out=file option to allow
     11        for the relocation of the binary build directory
     12        * mgr/fragments/nmake/dependencies: idem
     13        * mgr/fragments/library: Allow for the relocation of the binary build
     14        directory (via redefinition of the bin macro)
     15        * mgr/fragments/library_no_share: idem
     16        * mgr/fragments/library_no_static: idem
     17        * mgr/fragments/application: idem
     18        * mgr/fragments/cpp_library: idem
     19        * mgr/fragments/cpp: idem
     20        * mgr/fragments/c_library: idem
     21        * mgr/fragments/c: idem
     22        * mgr/fragments/fortran_library: idem
     23        * mgr/fragments/fortran: idem
     24        * mgr/fragments/cleanup_objects: idem
     25        * mgr/fragments/nmake/library: idem
     26        * mgr/fragments/nmake/library_no_share: idem
     27        * mgr/fragments/nmake/library_no_static: idem
     28        * mgr/fragments/nmake/application: idem
     29        * mgr/cmt_make_shlib_common.sh: idem
     30        * mgr/cmt_make_shlib.bat: idem
     31        * mgr/requirements: idem
     32        * src/NMakefile.header: Allow for the relocation of the binary build
     33        directory (via redefinition of the bin macro), place all the make files
     34        generated by CMT in the binary build directory
     35        * mgr/fragments/nmake/constituents_header: idem
     36        * mgr/fragments/nmake/constituent: idem
     37        * mgr/fragments/nmake/constituent_lock: idem
     38        * mgr/fragments/nmake/make_header: idem
     39       
    1402008-10-20    <rybkin@lal.in2p3.fr> 369
    241       
    … …  
    544        to import what is requested only. Do not set macro ${CONSTITUENT}linkopts
    645        * mgr/fragments/application: Use $(cmt_installarea_linkopts) with
    7         $(${CONSTITUENT}_use_linkopts) instead of $(${CONSTITUENT}linkopts)
     46        $(${CONSTITUENT}_use_linkopts) instead of $(use_linkopts)
    847        * mgr/fragments/dsp_application_header: idem
    948        * mgr/fragments/dsp_windows_header: idem

  • CMT/HEAD/mgr/VisualC.nmake

    r445 r469  
    11CMT_tag=$(tag)
    2 CMT_root=Z:\user\g\grybkine\maxidisk\Labs\devel\CMT\HEAD
     2CMT_root=Y:\user\g\grybkine\labs\CMT\HEAD
    33CMTVERSION=HEAD
     4CMT_project=grybkine
     5CMT_project_release=labs
    46cmt_hardware_query_command=uname -m
    57cmt_hardware=WIN32
    … …  
    3234shlibbuilder= $(cmt_installarea_linkopts) 
    3335library_install_command=copy 
    34 build_library_links=$(cmtexe) build library_links -quiet -tag=$(tags)
    35 remove_library_links=$(cmtexe) remove library_links -quiet -tag=$(tags)
     36build_library_links=$(cmtexe) build library_links -tag=$(tags)
     37remove_library_links=$(cmtexe) remove library_links -tag=$(tags)
    3638cmtexe=$(CMTROOT)\$(CMTBIN)\cmt.exe
    3739build_prototype=$(cmtexe) build prototype
    38 build_dependencies=$(cmtexe) -quiet -tag=$(tags) build dependencies
     40build_dependencies=$(cmtexe) -tag=$(tags) build dependencies
    3941build_triggers=$(cmtexe) build triggers
    4042implied_library_prefix=-l
    … …  
    8082srcdir=..\src
    8183bin=..\$(CMT_tag)\
     84BIN=Y:\user\g\grybkine\labs\CMT\HEAD\$(CMT_tag)\
    8285javabin=..\classes\
    8386mgrdir=mgr
    84 cmt_installarea_paths= $(cmt_installarea_prefix)/$(CMTCONFIG)/bin
    85 use_linkopts= $(cmt_installarea_linkopts) 
     87project=grybkine
     88cmt_installarea_paths= $(cmt_installarea_prefix)/$(CMTCONFIG)/bin $(grybkine_installarea_prefix)/$(CMTCONFIG)/lib $(grybkine_installarea_prefix)/share/lib $(grybkine_installarea_prefix)/share/bin
     89use_linkopts= $(cmt_installarea_linkopts)   $(CMT_linkopts) 
     90grybkine_installarea_prefix=$(cmt_installarea_prefix)
     91grybkine_installarea_prefix_remove=$(grybkine_installarea_prefix)
     92cmt_installarea_linkopts= /LIBPATH:Y:\user\g\grybkine\labs\$(grybkine_installarea_prefix)\$(CMTCONFIG)\lib 
     93CMTINSTALLAREA=Y:\user\g\grybkine\labs\$(cmt_installarea_prefix)
     94use_requirements=requirements 
     95use_includes= 
     96use_fincludes= $(use_includes)
     97use_stamps= $(CMT_stamps) 
     98use_cflags=  $(CMT_cflags) 
     99use_pp_cflags=  $(CMT_pp_cflags) 
     100use_cppflags=  $(CMT_cppflags) 
     101use_pp_cppflags=  $(CMT_pp_cppflags) 
     102use_fflags=  $(CMT_fflags) 
     103use_pp_fflags=  $(CMT_pp_fflags) 
     104includes= $(ppcmd)"$(srcdir)" $(use_includes)
     105fincludes= $(includes)
    86106cmt_use_linkopts=  $(CMT_linkopts) 
    87107constituents= cmt 

  • CMT/HEAD/mgr/cmt_dependencies.nmake

    r445 r469  
    11cmt_cxx_dependencies = "..\source\cmt.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h"
    2 cmt_awk_cxx_dependencies = "..\source\cmt_awk.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_awk.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
     2cmt_awk_cxx_dependencies = "..\source\cmt_awk.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_awk.h" "..\source\cmt_vector.h" "..\source\cmt_system.h" "..\source\cmt_log.h" "..\source\cmt_map.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h"
    33cmt_branch_cxx_dependencies = "..\source\cmt_branch.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    4 cmt_constituent_cxx_dependencies = "..\source\cmt_constituent.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_branch.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
     4cmt_constituent_cxx_dependencies = "..\source\cmt_constituent.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_branch.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_log.h"
    55cmt_deps_builder_cxx_dependencies = "..\source\cmt_deps_builder.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
    6 cmt_fragment_cxx_dependencies = "..\source\cmt_fragment.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_branch.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    7 cmt_generator_cxx_dependencies = "..\source\cmt_generator.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_generators.h"
     6cmt_fragment_cxx_dependencies = "..\source\cmt_fragment.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_branch.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_log.h"
     7cmt_generator_cxx_dependencies = "..\source\cmt_generator.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_generators.h" "..\source\cmt_log.h"
    88cmt_include_cxx_dependencies = "..\source\cmt_include.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_map.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
    99cmt_parser_cxx_dependencies = "..\source\cmt_parser.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_version.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_deps_builder.h" "..\source\cmt_generator.h" "..\source\cmt_error.h" "..\source\cmt_cvs.h" "..\source\cmt_lock.h" "..\source\cmt_triggers.h" "..\source\cmt_model.h" "..\source\cmt_syntax.h" "..\source\cmt_install_area.h" "..\source\cmt_sequence.h" "..\source\cmt_log.h" "..\source\cmt_commands.h"
    1010cmt_script_cxx_dependencies = "..\source\cmt_script.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_script.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h"
    1111cmt_string_cxx_dependencies = "..\source\cmt_string.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h"
    12 cmt_system_cxx_dependencies = "..\source\cmt_system.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h" "..\source\cmt_map.h"
     12cmt_system_cxx_dependencies = "..\source\cmt_system.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h" "..\source\cmt_map.h" "..\source\cmt_log.h"
    1313cmt_tag_cxx_dependencies = "..\source\cmt_tag.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_log.h"
    14 cmt_use_cxx_dependencies = "..\source\cmt_use.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h"
    15 cmt_symbol_cxx_dependencies = "..\source\cmt_symbol.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    16 cmt_error_cxx_dependencies = "..\source\cmt_error.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_error.h" "..\source\cmt_vector.h"
    17 cmt_pattern_cxx_dependencies = "..\source\cmt_pattern.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_error.h" "..\source\cmt_syntax.h"
     14cmt_use_cxx_dependencies = "..\source\cmt_use.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h" "..\source\cmt_log.h"
     15cmt_symbol_cxx_dependencies = "..\source\cmt_symbol.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_log.h"
     16cmt_error_cxx_dependencies = "..\source\cmt_error.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_error.h" "..\source\cmt_vector.h" "..\source\cmt_log.h"
     17cmt_pattern_cxx_dependencies = "..\source\cmt_pattern.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_error.h" "..\source\cmt_syntax.h" "..\source\cmt_log.h"
    1818cmt_language_cxx_dependencies = "..\source\cmt_language.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_language.h" "..\source\cmt_branch.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    19 cmt_cvs_cxx_dependencies = "..\source\cmt_cvs.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_cvs.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h"
     19cmt_cvs_cxx_dependencies = "..\source\cmt_cvs.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_cvs.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_project.h" "..\source\cmt_log.h"
    2020cmt_group_cxx_dependencies = "..\source\cmt_group.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_group.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    2121cmt_database_cxx_dependencies = "..\source\cmt_database.cxx" "..\source\cmt_vector.h" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h"
    22 cmt_lock_cxx_dependencies = "..\source\cmt_lock.cxx" "..\source\cmt_std.h" "..\source\cmt_lock.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h"
    23 cmt_triggers_cxx_dependencies = "..\source\cmt_triggers.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_triggers.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h"
     22cmt_lock_cxx_dependencies = "..\source\cmt_lock.cxx" "..\source\cmt_std.h" "..\source\cmt_lock.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_error.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
     23cmt_triggers_cxx_dependencies = "..\source\cmt_triggers.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_triggers.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_awk.h" "..\source\cmt_map.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_log.h"
    2424cmt_regexp_cxx_dependencies = "..\source\cmt_regexp.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
    25 cmt_model_cxx_dependencies = "..\source\cmt_model.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_model.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h"
    26 cmt_project_cxx_dependencies = "..\source\cmt_project.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h" "..\source\cmt_error.h"
    27 cmt_syntax_cxx_dependencies = "..\source\cmt_syntax.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_language.h" "..\source\cmt_cmtpath_pattern.h"
    28 cmt_install_area_cxx_dependencies = "..\source\cmt_install_area.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_parser.h" "..\source\cmt.h" "..\source\cmt_install_area.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h"
     25cmt_model_cxx_dependencies = "..\source\cmt_model.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_model.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_fragment.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_log.h"
     26cmt_project_cxx_dependencies = "..\source\cmt_project.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h" "..\source\cmt_error.h" "..\source\cmt_log.h"
     27cmt_syntax_cxx_dependencies = "..\source\cmt_syntax.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_error.h" "..\source\cmt_branch.h" "..\source\cmt_language.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_log.h"
     28cmt_install_area_cxx_dependencies = "..\source\cmt_install_area.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt_parser.h" "..\source\cmt.h" "..\source\cmt_install_area.h" "..\source\cmt_map.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_syntax.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_log.h"
    2929cmt_cmtpath_pattern_cxx_dependencies = "..\source\cmt_cmtpath_pattern.cxx" "..\source\cmt_vector.h" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_branch.h" "..\source\cmt_fragment.h" "..\source\cmt_group.h" "..\source\cmt_constituent.h" "..\source\cmt_language.h" "..\source\cmt_map.h" "..\source\cmt_pattern.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_cmtpath_pattern.h" "..\source\cmt_database.h" "..\source\cmt_syntax.h"
    3030cmt_sequence_cxx_dependencies = "..\source\cmt_sequence.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_regexp.h" "..\source\cmt_awk.h" "..\source\cmt_sequence.h" "..\source\cmt_vector.h" "..\source\cmt_system.h"
    … …  
    3232cmt_scope_section_cxx_dependencies = "..\source\cmt_scope_section.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_parser.h" "..\source\cmt_scope_section.h"
    3333cmt_log_cxx_dependencies = "..\source\cmt_log.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_log.h" "..\source\cmt_vector.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h"
    34 cmt_commands_cxx_dependencies = "..\source\cmt_commands.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_commands.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h"
     34cmt_commands_cxx_dependencies = "..\source\cmt_commands.cxx" "..\source\cmt_std.h" "..\source\cmt_string.h" "..\source\cmt_vector.h" "..\source\cmt_map.h" "..\source\cmt_parser.h" "..\source\cmt_regexp.h" "..\source\cmt_system.h" "..\source\cmt.h" "..\source\cmt_commands.h" "..\source\cmt_include.h" "..\source\cmt_script.h" "..\source\cmt_pattern.h" "..\source\cmt_scope_section.h" "..\source\cmt_use.h" "..\source\cmt_tag.h" "..\source\cmt_symbol.h" "..\source\cmt_awk.h" "..\source\cmt_project.h" "..\source\cmt_log.h"

  • CMT/HEAD/mgr/cmt_make_shlib.bat

    r11 r469  
    44
    55rem #
    6 set bin=..\%1%
     6rem set bin=..\%1%
     7
     8if not defined bin (
     9  for /f "usebackq" %%i in (`cmt show macro_value bin`) do set bin=%%i
     10)
    711set name=%2%
    812

  • CMT/HEAD/mgr/cmt_make_shlib_common.sh

    r465 r469  
    77#  Syntax :
    88#
    9 #  cmt_make_shlib_common.sh extract-arg package extra-args
     9#  cmt_make_shlib_common.sh extract-arg tag library extra-args
    1010#
    1111#   with :
    1212#
    1313#      extract-arg  : either "extract" or "no_extract"
    14 #      package      : the current package name
     14#      tag          : the current tag(s)
     15#      library      : the name of the library
    1516#      extra-args   : extra link options
    1617#
    … …  
    2829extra=$*
    2930
    30 here=`/bin/pwd`
    31 
    3231ld=`${CMTROOT}/mgr/cmt show macro_value shlibbuilder -tag=${tag}`
    3332ldflags=`${CMTROOT}/mgr/cmt show macro_value shlibflags -tag=${tag}`
    … …  
    3635libsuffix=`${CMTROOT}/mgr/cmt show macro_value library_suffix -tag=${tag}`
    3736
     37libname=${libprefix}${lib}${libsuffix}
     38
    3839if test "${ld}" = "" ; then
    3940  exit 1
    4041fi
    4142
    42 libname=${libprefix}${lib}${libsuffix}
     43if test "${bin}" = "" ; then
     44  bin=`${CMTROOT}/mgr/cmt show macro_value bin -tag=${tag}`
     45fi
     46
     47here=`/bin/pwd`
     48cd ${bin}
     49
    4350/bin/rm -f ${libname}.${suffix}
    4451
    … …  
    4855
    4956if test ${extract} = "extract"; then
    50   trap 'cd ${here}; /bin/rm -rf ${temp_shlib}; exit ${result}' 0 1 2 15
     57  trap '/bin/rm -rf ${temp_shlib}; cd ${here}; exit ${result}' 1 2 15
    5158
    5259  mkdir -p ${temp_shlib}
    … …  
    6875
    6976  if test "${QUIET}" = ""; then set -v; fi
     77
    7078  eval ${ld} ${ldflags} -o ${libname}.${suffix} ${modules} ${extra}
    7179  result=$?
    … …  
    8694fi
    8795
    88 
    89 
    90 
     96cd ${here}
     97exit ${result}

  • CMT/HEAD/mgr/fragments/application

    r468 r469  
    33$(bin)${CONSTITUENT}${application_suffix} :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
    44        $(link_echo) "application $@"
    5         $(link_silent) cd $(bin); ${LINKMACRO} -o ${CONSTITUENT}.exe.new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts); mv -f ${CONSTITUENT}.exe.new ${CONSTITUENT}${application_suffix}
     5        $(link_silent) ${LINKMACRO} -o $(@).new ${OBJS} $(cmt_installarea_linkopts) $(${CONSTITUENT}_use_linkopts) $(${CONSTITUENT}linkopts) && mv -f $(@).new $(@)
    66
    77#-----------------------------------------------------------------

  • CMT/HEAD/mgr/fragments/c

    r441 r469  
    44
    55$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(c_echo) $<
    7         $(c_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(app_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(app_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(c_echo) ${FULLNAME}
     7        $(c_silent) $(ccomp) -o $@ $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(app_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(app_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
     8#       $(c_silent) cd $(bin); $(ccomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(app_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(app_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    89
    910#-- end of c ------

  • CMT/HEAD/mgr/fragments/c_library

    r441 r469  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(c_echo) $<
    7         $(c_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(c_echo) ${FULLNAME}
     7        $(c_silent) $(ccomp) -o $@ $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
     8#       $(c_silent) cd $(bin); $(ccomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cflags) $(${CONSTITUENT}_pp_cflags) $(lib_${CONSTITUENT}_pp_cflags) $(${NAME}_pp_cflags) $(use_cflags) $(${CONSTITUENT}_cflags) $(lib_${CONSTITUENT}_cflags) $(${NAME}_cflags) $(${NAME}_${FILESUFFIX}_cflags) ${ADDINCLUDE} ${FULLNAME}
    89
    910#-- end of c_library ------

  • CMT/HEAD/mgr/fragments/cleanup_objects

    r79 r469  
    11#-- start of cleanup_objects ------
    22        $(cleanup_echo) objects
    3         -$(cleanup_silent) cd $(bin); /bin/rm -f ${OBJS}
     3        -$(cleanup_silent) /bin/rm -f ${OBJS}
    44        -$(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    55#-- end of cleanup_objects ------

  • CMT/HEAD/mgr/fragments/cpp

    r441 r469  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(cpp_echo) $<
    7         $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(cpp_echo) ${FULLNAME}
     7        $(cpp_silent) $(cppcomp) -o $(@) $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(app_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(app_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
    88
    99#-- end of cpp ------

  • CMT/HEAD/mgr/fragments/cpp_library

    r441 r469  
    44
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(cpp_echo) $<
    7         $(cpp_silent) cd $(bin); $(cppcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(cpp_echo) ${FULLNAME}
     7        $(cpp_silent) $(cppcomp) -o $(@) $(use_pp_cppflags) $(${CONSTITUENT}_pp_cppflags) $(lib_${CONSTITUENT}_pp_cppflags) $(${NAME}_pp_cppflags) $(use_cppflags) $(${CONSTITUENT}_cppflags) $(lib_${CONSTITUENT}_cppflags) $(${NAME}_cppflags) $(${NAME}_${FILESUFFIX}_cppflags) ${ADDINCLUDE} ${FULLNAME}
    88
    99#-- end of cpp_library ------------------

  • CMT/HEAD/mgr/fragments/dependencies

    r456 r469  
    77$(bin)${CONSTITUENT}_dependencies.make : ${LINE} $(use_requirements) $(cmt_final_setup_${CONSTITUENT})
    88        $(echo) "(${CONSTITUENT}.make) Rebuilding $@"; \
    9           $(build_dependencies) ${CONSTITUENT} -all_sources
     9          $(build_dependencies) ${CONSTITUENT} -all_sources -out=$@
    1010endif
    1111

  • CMT/HEAD/mgr/fragments/fortran

    r441 r469  
    44 
    55$(bin)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(fortran_echo) $<
    7         $(fortran_silent)cd $(bin); $(fcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(app_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(app_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(fortran_echo) ${FULLNAME}
     7        $(fortran_silent) $(fcomp) -o $@ $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(app_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(app_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
     8#       $(fortran_silent)cd $(bin); $(fcomp) -o ${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(app_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(app_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    89
    910#-- end of fortran ------

  • CMT/HEAD/mgr/fragments/fortran_library

    r441 r469  
    44 
    55$(bin)$(binobj)${NAME}${CONSTITUENTSUFFIX}.o : $(${NAME}_${FILESUFFIX}_dependencies)
    6         $(fortran_echo) $<
    7         $(fortran_silent)cd $(bin); $(fcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
     6        $(fortran_echo) ${FULLNAME}
     7        $(fortran_silent) $(fcomp) -o $@ $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
     8#       $(fortran_silent)cd $(bin); $(fcomp) -o $(binobj)${NAME}${CONSTITUENTSUFFIX}.o $(use_pp_fflags) $(${CONSTITUENT}_pp_fflags) $(lib_${CONSTITUENT}_pp_fflags) $(${NAME}_pp_fflags) $(use_fflags) $(${CONSTITUENT}_fflags) $(lib_${CONSTITUENT}_fflags) $(${NAME}_fflags) $(${NAME}_${FILESUFFIX}_fflags) ${ADDINCLUDE} ${FULLNAME}
    89
    910#-- end of fortran_library ------

  • CMT/HEAD/mgr/fragments/library

    r445 r469  
    66$(${CONSTITUENT}lib) :: ${OBJS}
    77        $(lib_echo) "static library $@"
    8         $(lib_silent) cd $(bin); \
    9           $(ar) $(${CONSTITUENT}lib) $?
     8        $(lib_silent) $(ar) $(${CONSTITUENT}lib) $?
    109        $(lib_silent) $(ranlib) $(${CONSTITUENT}lib)
    1110        $(lib_silent) cat /dev/null >$(${CONSTITUENT}stamp)
    … …  
    2928$(${CONSTITUENT}libname).$(shlibsuffix) :: $(${CONSTITUENT}lib) requirements $(use_requirements) $(${CONSTITUENT}stamps)
    3029        $(lib_echo) "shared library $@"
    31         $(lib_silent) cd $(bin); if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
     30        $(lib_silent) if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} bin=$(bin) $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
    3231
    3332$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)
    … …  
    3635${CONSTITUENT}clean ::
    3736        $(cleanup_echo) objects
    38         $(cleanup_silent) cd $(bin); /bin/rm -f ${OBJS}
     37        $(cleanup_silent) /bin/rm -f ${OBJS}
    3938        $(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    4039

  • CMT/HEAD/mgr/fragments/library_no_share

    r441 r469  
    55
    66$(${CONSTITUENT}lib) :: ${OBJS}
    7         $(lib_echo) "library $@"
    8         $(lib_silent) cd $(bin); \
    9           $(ar) $(${CONSTITUENT}lib) $?
     7        $(lib_echo) "static library $@"
     8        $(lib_silent) $(ar) $(${CONSTITUENT}lib) $?
    109        $(lib_silent) $(ranlib) $(${CONSTITUENT}lib)
    1110        $(lib_silent) cat /dev/null >$(${CONSTITUENT}stamp)
    … …  
    6362${CONSTITUENT}clean ::
    6463        $(cleanup_echo) ${OBJS}
    65         $(cleanup_silent) cd $(bin); /bin/rm -f ${OBJS}
     64        $(cleanup_silent) /bin/rm -f ${OBJS}
    6665
    6766#-- end of library_no_share ------

  • CMT/HEAD/mgr/fragments/library_no_static

    r466 r469  
    2828#
    2929
    30 #$(${CONSTITUENT}libname).$(shlibsuffix) :: $(${CONSTITUENT}lib) requirements $(use_requirements) $(${CONSTITUENT}stamps)
    31 #       $(lib_silent) cd $(bin); if test "$(makecmd)"; then QUIET=; else QUIET=1; fi; QUIET=$${QUIET} $(make_shlib) "$(tags)" ${CONSTITUENT} $(${CONSTITUENT}_shlibflags)
    3230$(${CONSTITUENT}libname).$(shlibsuffix) :: ${OBJS} $(use_requirements) $(${CONSTITUENT}stamps)
    3331        $(lib_echo) "shared library $@"
    3432        $(lib_silent) $(shlibbuilder) $(shlibflags) -o $@ ${OBJS} $(${CONSTITUENT}_shlibflags)
    35 #       $(lib_silent) cd $(bin); $(shlibbuilder) $(shlibflags) -o $(library_prefix)${CONSTITUENT}$(library_suffix).$(shlibsuffix) ${OBJS} $(${CONSTITUENT}_shlibflags)
    3633
    3734$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}libname).$(shlibsuffix)
    … …  
    4037${CONSTITUENT}clean ::
    4138        $(cleanup_echo) objects
    42         $(cleanup_silent) cd $(bin); /bin/rm -f ${OBJS}
     39        $(cleanup_silent) /bin/rm -f ${OBJS}
    4340        $(cleanup_silent) cd $(bin); /bin/rm -rf ${CONSTITUENT}_deps ${CONSTITUENT}_dependencies.make
    4441

  • CMT/HEAD/mgr/fragments/nmake/application

    r468 r469  
     1#-- start of application
    12
    23$(bin)${CONSTITUENT}$(application_suffix) :: ${OBJS} $(use_stamps) $(${CONSTITUENT}stamps) requirements $(use_requirements)
    … …  
    2627!if "$(CMTINSTALLAREA)" != ""
    2728        $(install_echo) $(@F) into $(@D)
    28         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     29        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installname)" "$(install_dir)"
    2930!endif
    3031
    … …  
    3637!if "$(CMTINSTALLAREA)" != ""
    3738        $(cleanup_echo) "$(${CONSTITUENT}installname)" from "$(install_dir)"
    38         $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     39        $(cleanup_silent) $(cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installname)" "$(install_dir)"
    3940!endif
    4041
     42#-- end of application

  • CMT/HEAD/mgr/fragments/nmake/constituent

    r459 r469  
    77!if defined (cmt_${CONSTITUENT}_has_target_tag)
    88
    9 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     9#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     10cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1011cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1112cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    … …  
    2425!else
    2526
    26 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
     27#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
     28cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    2729cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    2830cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    … …  
    3436        @set include=$(include)
    3537        @set lib=$(lib)
    36         @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}
    37         @move ${CONSTITUENT}.nmake $(bin)
     38        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
    3839        $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    3940
    … …  
    4243        @set include=$(include)
    4344        @set lib=$(lib)
    44         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
     45        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag)
    4546        $(echo) (constituents.nmake) ${CONSTITUENT} done
    4647
    … …  
    5152        @set include=$(include)
    5253        @set lib=$(lib)
    53         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     54        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    5455        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    5556
    … …  
    6061        @set include=$(include)
    6162        @set lib=$(lib)
    62         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
     63        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
    6364        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6465
    … …  
    6970        @set include=$(include)
    7071        @set lib=$(lib)
    71         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
     72        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    7273        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7374

  • CMT/HEAD/mgr/fragments/nmake/constituent_lock

    r459 r469  
    77!if defined (cmt_${CONSTITUENT}_has_target_tag)
    88
    9 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     9#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     10cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    1011cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_${CONSTITUENT}_setup.nmake
    1112cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    … …  
    2425!else
    2526
    26 cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
     27#cmt_local_tagfile_${CONSTITUENT} = $(${PACKAGE}_tag).nmake
     28cmt_local_tagfile_${CONSTITUENT} = $(bin)$(${PACKAGE}_tag).nmake
    2729cmt_final_setup_${CONSTITUENT} = $(bin)${PACKAGE}_setup.nmake
    2830cmt_local_${CONSTITUENT}_makefile = $(bin)${CONSTITUENT}.nmake
    … …  
    3436        @set include=$(include)
    3537        @set lib=$(lib)
    36         @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile ${CONSTITUENT}
    37         @move ${CONSTITUENT}.nmake $(bin)
     38        @$(cmtexe) -tag=$(tags) $(${CONSTITUENT}_extratags) build -nmake constituent_makefile -out=$@ ${CONSTITUENT}
    3839        $(echo) (constituents.nmake) ${CONSTITUENT}.nmake done
    3940
    … …  
    4445        @set include=$(include)
    4546        @set lib=$(lib)
    46         @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
     47        @$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT} tag=$(tag) \
    4748        || ($(unlock_command) ${CONSTITUENT}$(lock_suffix) & exit 1)
    4849        @$(unlock_command) ${CONSTITUENT}$(lock_suffix)
    … …  
    5556        @set include=$(include)
    5657        @set lib=$(lib)
    57         @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
     58        @-if exist $(cmt_local_${CONSTITUENT}_makefile) $(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles ${CONSTITUENT}clean tag=$(tag)
    5859        $(echo) (constituents.nmake) ${CONSTITUENT}clean done
    5960
    … …  
    6465        @set include=$(include)
    6566        @set lib=$(lib)
    66         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles install tag=$(tag)
     67        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles install tag=$(tag)
    6768        $(echo) (constituents.nmake) install ${CONSTITUENT} done
    6869
    … …  
    7374        @set include=$(include)
    7475        @set lib=$(lib)
    75         @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) build_strategy=keep_makefiles uninstall tag=$(tag)
     76        @-$(MAKE) /nologo /f $(cmt_local_${CONSTITUENT}_makefile) /$(MAKEFLAGS) bin=$(bin) build_strategy=keep_makefiles uninstall tag=$(tag)
    7677        $(echo) (constituents.nmake) uninstall ${CONSTITUENT} done
    7778

  • CMT/HEAD/mgr/fragments/nmake/constituents_header

    r459 r469  
    1111
    1212${PACKAGE}_tag = $(tag)
     13#cmt_local_tagfile = $(bin)$(tag).nmake
     14cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).nmake
    1315
    14 !if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
     16#!if [$(echo) (constituents.nmake) Rebuilding $(${PACKAGE}_tag).nmake] == 0
     17!if [$(echo) (constituents.nmake) Rebuilding $(cmt_local_tagfile)] == 0
    1518!endif
    1619
    17 !if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0
     20#!if [cmt build tag_makefile -tag_add=$(tags) >$(${PACKAGE}_tag).nmake] == 0
     21!if [cmt build tag_makefile -tag_add=$(tags) >$(cmt_local_tagfile)] == 0
    1822!endif
    1923
    20 !include $(${PACKAGE}_tag).nmake
     24#!include $(${PACKAGE}_tag).nmake
     25!include $(cmt_local_tagfile)
    2126
    2227all ::

  • CMT/HEAD/mgr/fragments/nmake/dependencies

    r11 r469  
    44!else
    55!if exist ("$(CMTROOT)/$(CMTBIN)/cmt.exe")
    6 !if [$(build_dependencies) ${CONSTITUENT} -all_sources] == 0
     6!if [$(build_dependencies) ${CONSTITUENT} -all_sources -out=$(bin)${CONSTITUENT}_dependencies.nmake] == 0
    77!endif
    88!else

  • CMT/HEAD/mgr/fragments/nmake/library

    r445 r469  
     1#-- start of libary ----------------------
    12
    23${CONSTITUENT}LIB :: $(${CONSTITUENT}shstamp)
    … …  
    5253!if "$(CMTINSTALLAREA)" != ""
    5354        $(install_echo) $(@F) into $(@D)
    54         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     55        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
    5556!endif
    5657
    … …  
    5859!if "$(CMTINSTALLAREA)" != ""
    5960        $(install_echo) $(@F) into $(@D)
    60         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     61        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
    6162!endif
    6263
    … …  
    6465!if "$(CMTINSTALLAREA)" != ""
    6566        $(install_echo) $(@F) into $(@D)
    66         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
     67        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
    6768!endif
    6869
    … …  
    7475!if "$(CMTINSTALLAREA)" != ""
    7576        $(cleanup_echo) "$(${CONSTITUENT}installlibname)" from "$(install_dir)"
    76         $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     77        $(cleanup_silent) $(cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
    7778        $(cleanup_echo) "$(${CONSTITUENT}installdllname)" from "$(install_dir)"
    78         $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     79        $(cleanup_silent) $(cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
    7980!endif
    8081
     82#-- end of libary -----------------------

  • CMT/HEAD/mgr/fragments/nmake/library_no_share

    r445 r469  
     1#-- start of library_no_share ------
    12
    23${CONSTITUENT}LIB :: $(${CONSTITUENT}lib)
    … …  
    3031!if "$(CMTINSTALLAREA)" != ""
    3132        $(install_echo) $(@F) into $(@D)
    32         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     33        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installname)" "$(install_dir)"
    3334!endif
    3435
    … …  
    4041!if "$(CMTINSTALLAREA)" != ""
    4142        $(cleanup_echo) "$(${CONSTITUENT}installname)" from "$(install_dir)"
    42         $(cleanup_silent) (cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installname)" "$(install_dir)"
     43        $(cleanup_silent) (cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installname)" "$(install_dir)"
    4344!endif
    4445
     46#-- end of library_no_share ------

  • CMT/HEAD/mgr/fragments/nmake/library_no_static

    r466 r469  
    1212
    1313#$(${CONSTITUENT}shstamp) :: $(${CONSTITUENT}arc) requirements $(use_requirements) $(${CONSTITUENT}stamps)
    14 $(${CONSTITUENT}shstamp) :: ${OBJS} requirements $(use_requirements) $(${CONSTITUENT}stamps)
     14$(${CONSTITUENT}shstamp) :: ${OBJS} $(use_requirements) $(${CONSTITUENT}stamps)
    1515        $(lib_echo) dynamic library $(bin)${CONSTITUENT}.dll
    1616#       $(lib_silent) $(make_shlib) $(tag) ${CONSTITUENT} $(cpplinkflags) $(${CONSTITUENT}_shlibflags)
    … …  
    7171!if "$(CMTINSTALLAREA)" != ""
    7272        $(install_echo) $(@F) into $(@D)
    73         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     73        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
    7474!endif
    7575
    … …  
    7777!if "$(CMTINSTALLAREA)" != ""
    7878        $(install_echo) $(@F) into $(@D)
    79         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     79        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
    8080!endif
    8181
    … …  
    8383!if "$(CMTINSTALLAREA)" != ""
    8484        $(install_echo) $(@F) into $(@D)
    85         $(install_silent) $(cmt_install_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
     85        $(install_silent) $(cmt_install_action) "$(BIN)" "$(${CONSTITUENT}installpdbname)" "$(install_dir)"
    8686!endif
    8787
    … …  
    9393!if "$(CMTINSTALLAREA)" != ""
    9494        $(cleanup_echo) "$(${CONSTITUENT}installlibname)" from "$(install_dir)"
    95         $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
     95        $(cleanup_silent) $(cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installlibname)" "$(install_dir)"
    9696        $(cleanup_echo) "$(${CONSTITUENT}installdllname)" from "$(install_dir)"
    97         $(cleanup_silent) $(cmt_uninstall_action) "$(PACKAGE_ROOT)\$(tag)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
     97        $(cleanup_silent) $(cmt_uninstall_action) "$(BIN)" "$(${CONSTITUENT}installdllname)" "$(install_dir)"
    9898!endif
    9999

  • CMT/HEAD/mgr/fragments/nmake/make_header

    r11 r469  
     1#-- start of make_header -----------------
    12
    23#====================================
    … …  
    2930${PACKAGE}_tag = $(tag)
    3031
    31 cmt_local_tagfile = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     32#cmt_local_tagfile = $(${PACKAGE}_tag)_${CONSTITUENT}.nmake
     33cmt_local_tagfile = $(bin)$(${PACKAGE}_tag)_${CONSTITUENT}.nmake
    3234
    3335!else
    … …  
    3739${PACKAGE}_tag = $(tag)
    3840
    39 cmt_local_tagfile = $(${PACKAGE}_tag).nmake
     41#cmt_local_tagfile = $(${PACKAGE}_tag).nmake
     42cmt_local_tagfile = $(bin)$(${PACKAGE}_tag).nmake
    4043
    4144!endif
    … …  
    5760help ::
    5861        @echo '${CONSTITUENT}'
     62
     63#-- end of make_header ------------------

  • CMT/HEAD/mgr/requirements

    r466 r469  
    612612macro cmt_installdir_excludes  "" WIN32 "$(CMTROOT)\mgr\cmt_installdir_excludes.txt"
    613613
    614 action make "gmake $(cmt_args)" Darwin "make $(cmt_args)" CYGWIN "make $(cmt_args)" WIN32 "nmake /f nmake $(cmt_args)"
     614action make "gmake bin=$(bin) $(cmt_args)" Darwin "make bin=$(bin) $(cmt_args)" CYGWIN "make bin=$(bin) $(cmt_args)" WIN32 "nmake /f nmake $(cmt_args) bin=$(bin)"
     615# with NMake (Version 7.10.3077), the first macro definition on the command line
     616# takes precedence over the following (if any)
    615617
    616618macro mkdir  "mkdir" \

  • CMT/HEAD/source/cmt_generators.cxx

    r466 r469  
    26932693  prepare_header_file_filters ();
    26942694
    2695   m_stamps = true;
    2696 
    26972695  const cmt_string& name = arguments[0];
    2698 
    2699   //cerr << "name=" << name << endl;
    27002696
    27012697  m_constituent = Constituent::find (name);
    … …  
    27032699    {
    27042700      // Error : wrong constituent name...
    2705      
    27062701      return;
    27072702    }
    … …  
    27122707  cmt_string full_name;
    27132708  cmt_string compressed_name;
    2714   cmt_string suffix;
     2709  //  cmt_string suffix;
    27152710  cmt_string dependencies;
    2716 
    2717   //
    2718   // Now prepare the output file names
    2719   //
    2720   cmt_string branch = CmtSystem::current_branch ();
    2721 
    2722   if ((branch == "mgr") || (branch == "cmt"))
    2723     {
    2724       Use& current_use = Use::current ();
    2725 
    2726       Package* p = current_use.get_package ();
    2727 
    2728       if (p->is_cmt ())
    2729         {
    2730           m_bin = "../";
    2731           m_bin += CmtSystem::getenv ("CMTBIN");
    2732           m_bin += CmtSystem::file_separator ();
    2733         }
    2734       else
    2735         {
    2736           m_bin = "${bin}";
    2737         }
    2738 
    2739       Symbol::expand (m_bin);
    2740 
    2741       //cerr << "m_output_file_name=" << m_output_file_name << endl;
    2742       //cerr << "current_tag=" << Cmt::current_tag << endl;
    2743     }
    2744   else
    2745     {
    2746       m_bin = ".";
    2747       m_bin += CmtSystem::file_separator ();
    2748     }
    2749 
    2750   m_output_file_name = m_bin;
    2751   m_output_file_name += name;
    2752   m_output_file_name += "_";
    2753   m_output_file_name += "dependencies.";
    2754   if (Cmt::build_nmake ())
    2755     {
    2756       m_output_file_name += "nmake";
    2757     }
    2758   else
    2759     {
    2760       m_output_file_name += "make";
    2761     }
    2762 
    2763   //
    2764   // New read the existing dependency file if any and filter it to
    2765   // extract the source names
    2766   //
    2767   static DependencyFilter filter;
    2768 
    2769   dependencies.read (m_output_file_name);
    2770 
    2771   filter.run (dependencies);
    27722711
    27732712  //
    … …  
    27882727  const cmt_vector<cmt_regexp>& selects = constituent.select_exprs;
    27892728
     2729  m_stamps = true;
    27902730  bool all_sources = false;
    27912731
    … …  
    28032743      // Get rid of files that may come from the makefile fragment
    28042744      if (file_name.find ("requirements") != cmt_string::npos) source_number--;
     2745      else if (file_name.substr (0, 5) == "-out=")
     2746        {
     2747          if (!all_sources) source_number--;
     2748          file_name.erase (0, 5);
     2749          m_output_file_name = file_name;
     2750        }
    28052751      else if (file_name.find (".make") != cmt_string::npos) source_number--;
    28062752      else if (file_name == "-all_sources")
    … …  
    28112757      else if (file_name == "-no_stamps")
    28122758        {
    2813           source_number--;
     2759          if (!all_sources) source_number--;
    28142760          m_stamps = false;
    28152761        }
    28162762    }
    28172763
     2764  //
     2765  // Now prepare the output file names
     2766  //
     2767  cmt_string branch = CmtSystem::current_branch ();
     2768
     2769  if ((branch == "mgr") || (branch == "cmt"))
     2770    {
     2771      Use& current_use = Use::current ();
     2772
     2773      Package* p = current_use.get_package ();
     2774
     2775      if (p->is_cmt ())
     2776        {
     2777          //          m_bin = "../";
     2778          m_bin = "..";
     2779          m_bin += CmtSystem::file_separator ();
     2780          m_bin += CmtSystem::getenv ("CMTBIN");
     2781          m_bin += CmtSystem::file_separator ();
     2782        }
     2783      else if (m_output_file_name != "")
     2784        {
     2785          CmtSystem::dirname (m_output_file_name, m_bin);
     2786          if (m_bin == "")
     2787            {
     2788              m_bin = ".";
     2789            }
     2790          m_bin += CmtSystem::file_separator ();
     2791        }
     2792      else
     2793        {
     2794          m_bin = "${bin}";
     2795        }
     2796
     2797      Symbol::expand (m_bin);
     2798
     2799      //cerr << "m_output_file_name=" << m_output_file_name << endl;
     2800      //cerr << "current_tag=" << Cmt::current_tag << endl;
     2801    }
     2802  else
     2803    {
     2804      m_bin = ".";
     2805      m_bin += CmtSystem::file_separator ();
     2806    }
     2807
     2808  if (m_output_file_name == "")
     2809    {
     2810      m_output_file_name = m_bin;
     2811      m_output_file_name += name;
     2812      m_output_file_name += "_";
     2813      m_output_file_name += "dependencies.";
     2814      if (Cmt::build_nmake ())
     2815        {
     2816          m_output_file_name += "nmake";
     2817        }
     2818      else
     2819        {
     2820          m_output_file_name += "make";
     2821        }
     2822    }
    28182823
    28192824  if (all_sources)
    … …  
    28482853  else
    28492854    {
     2855      //
     2856      // New read the existing dependency file if any and filter it to
     2857      // extract the source names
     2858      //
     2859      static DependencyFilter filter;
     2860      dependencies.read (m_output_file_name);
     2861      filter.run (dependencies);
     2862     
    28502863      for (i = 1; i < source_number; i++)
    28512864        {

  • CMT/HEAD/source/cmt_parser.cxx

    r468 r469  
    70467046        apply ();
    70477047
     7048        buffer = "macro BIN \"";
     7049        buffer += pwd;
     7050        buffer += fs;
     7051        buffer += "\"";
     7052        apply ();
     7053
    70487054        buffer = "macro javabin \".";
    70497055        buffer += fs;
    … …  
    71107116            buffer += "\"";
    71117117            apply ();
     7118
     7119            cmt_string pardir;
     7120            CmtSystem::dirname (pwd, pardir);
     7121            //            buffer = "macro BIN \"$(PACKAGE_ROOT)";
     7122            buffer = "macro BIN \"";
     7123            buffer += pardir;
     7124            buffer += fs;
     7125            buffer += "$(";
     7126            buffer += package_tag;
     7127            buffer += ")";
     7128            buffer += fs;
     7129            buffer += "\"";
     7130            apply ();
    71127131          }
     7132        else
     7133          {
     7134            cmt_string temp = "$(bin)";
     7135            Symbol::expand (temp);
     7136            int len (temp.size());
     7137            cmt_string atemp;
     7138            if (CmtSystem::absolute_path (temp))
     7139              {
     7140                CmtSystem::compress_path (temp, atemp);
     7141              }
     7142            else
     7143              {
     7144                atemp = pwd + fs + temp;
     7145                CmtSystem::compress_path (atemp);
     7146              }
     7147            buffer = "macro BIN \"";
     7148            buffer += atemp;
     7149            buffer += "\"";
     7150            apply ();
     7151            if (0 != len && fs != temp[len - 1])
     7152              {
     7153                buffer = "macro_append bin \"";
     7154                buffer += fs;
     7155                buffer += "\"";
     7156                apply ();
     7157
     7158                buffer = "macro_append BIN \"";
     7159                buffer += fs;
     7160                buffer += "\"";
     7161                apply ();
     7162              }
     7163          }
    71137164
    71147165        if (!Symbol::is_selected ("javabin"))

  • CMT/HEAD/src/NMakefile.header

    r459 r469  
    5555
    5656
    57 !if [$(cmtexe) build constituents_makefile -tag=$(tags)] == 0
     57cmt_constituents_makefile = $(bin)constituents.nmake
     58
     59!IF !EXIST ("$(bin)")
     60!if [mkdir "$(bin)"] == 0
     61!endif
     62!ENDIF
     63
     64!if [$(cmtexe) -tag=$(tags) build constituents_makefile -out=$(cmt_constituents_makefile)] == 0
    5865!endif
    5966
    60 !include constituents.nmake
     67!include $(cmt_constituents_makefile)
     68#!include constituents.nmake
    6169
    6270
Note: See TracChangeset for help on using the changeset viewer.