Changeset 96 for CMT/HEAD


Ignore:
Timestamp:
Oct 11, 2005, 3:39:02 PM (19 years ago)
Author:
arnault
Message:

Fixes for spaces in paths see CL#284

Location:
CMT/HEAD
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/ChangeLog

    r95 r96  
     12005-10-11    <arnault@lal.in2p3.fr> 284
     2
     3        * source\cmt_parser.cxx (class StandardMacroBuilder): Enclose
     4        items in the use_requirements macro into double quotes using the q
     5        macro. This to cope with spaces in directories on Windows.
     6        (dos_script_prefix): Add quotes for the -path argument
     7
     8        * mgr\requirements: Add a macro definition to hold a double-quote
     9
     102005-09-13    <arnault@lal.in2p3.fr> 283
     11
     12        * mgr/CMT.pacman: Add constraint on version of pacman
     13        Use ./INSTALL instead of just INSTALL
     14
    1152005-09-29  Christian Arnault  <arnault@lal.in2p3.fr> 283
    216

  • CMT/HEAD/mgr

    • Property snv:ignore set to
      cleanup.*
      setup.*

  • CMT/HEAD/mgr/CMT.pacman

    r45 r96  
    99version ('<version>')
    1010
     11pacmanVersionGE('3.13')
     12
    1113{
    1214    platformGE ('Linux') ; downloadUntar ('http://www.cmtsite.org/<version>/CMT<version>Linux-i686.tar.gz', 'CMTBASE')
    … …  
    1820
    1921cd ('$CMTBASE/<version>/mgr')
    20 shellOutputContains ('INSTALL', 'CMT installation terminated')
     22shellOutputContains ('./INSTALL', 'CMT installation terminated')
    2123{
    2224  shellOutputContains ('. setup.sh; cmt version', '<version>')

  • CMT/HEAD/mgr/VisualC.nmake

    r78 r96  
    4040implied_library_suffix=.lib
    4141SHELL=cmd
     42q="
    4243src=..\src\
    4344doc=..\doc\

  • CMT/HEAD/mgr/cmt.nmake

    r95 r96  
    33#  Application cmt
    44#
    5 #   Generated Fri Sep 30 09:25:35 2005  by arnault
     5#   Generated Tue Oct 11 12:15:27 2005  by arnault
    66#
    77#====================================

  • CMT/HEAD/mgr/requirements

    r83 r96  
    434434macro SHELL           "/bin/sh" WIN32 "cmd"
    435435
     436macro q               '"'
    436437macro src             "../src/" WIN32 "..\src\"
    437438macro doc             "../doc/" WIN32 "..\doc\"

  • CMT/HEAD/source/cmt_parser.cxx

    r95 r96  
    40714071  fprintf (f, "set cmttempfile=\"%%TEMP%%\\tmpsetup.bat\"\n");
    40724072  fprintf (f, "%%CMTROOT%%\\%%CMTBIN%%\\cmt.exe %s -bat "
    4073            " -pack=%s -version=%s -path=%%~d0%%~p0%s "
     4073           " -pack=%s -version=%s -path=\"%%~d0%%~p0%s\" "
    40744074           " %s "
    40754075           "%%1 %%2 %%3 %%4 %%5 %%6 %%7 %%8 %%9 >%%cmttempfile%%\n",
    … …  
    65276527    if (Uses.size () == 0) return;
    65286528
     6529    //buffer = "macro q '\"'";
     6530    //apply ();
     6531
    65296532    if (!Symbol::is_selected ("use_requirements"))
    65306533      {
    … …  
    65406543            if (use->located ())
    65416544              {
    6542                 buffer += "$(";
     6545                buffer += "$(q)$(";
    65436546                buffer += use->prefix;
    65446547                buffer += "ROOT)";
    … …  
    65496552               
    65506553                buffer += fs;
    6551                 buffer += "requirements ";
     6554                buffer += "requirements$(q) ";
    65526555              }
    65536556          }
Note: See TracChangeset for help on using the changeset viewer.