Changeset 3672

Show
Ignore:
Timestamp:
2008-09-05 08:54:03 (4 months ago)
Author:
sunshine
Message:

Updated mk/autoconf/*.m4, mk/jam/*.jam, and mk/msvcgen/*.tlib files from
master copies in CS repository.

Location:
cel/trunk/mk
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • cel/trunk/mk/autoconf/crystal.m4

    r3529 r3672  
    2121 
    2222# Should stay in sync with csver.h 
    23 m4_define([cs_min_version_default], [1.4]) 
     23m4_define([cs_min_version_default], [1.9]) 
    2424 
    2525#------------------------------------------------------------------------------ 
  • cel/trunk/mk/autoconf/path.m4

    r906 r3672  
    11# path.m4                                                      -*- Autoconf -*- 
    22#============================================================================== 
    3 # Copyright (C)2004 by Eric Sunshine <sunshine@sunshineco.com> 
     3# Copyright (C)2004,2008 by Eric Sunshine <sunshine@sunshineco.com> 
    44# 
    55#    This library is free software; you can redistribute it and/or modify it 
     
    2020AC_PREREQ([2.56]) 
    2121 
     22 
     23#------------------------------------------------------------------------------ 
     24# CS_PATH_NORMALIZE_EMBEDDED(STRING) 
     25#       Normalize all paths embedded in STRING at run-time by transliterating 
     26#       Windows/DOS backslashes to forward slashes.  Also collapses whitespace. 
     27#       This is useful when applied to command output which may include 
     28#       embedded Windows-style paths since the backslashes in those paths could 
     29#       be incorrectly interpreted in the context of Makefiles or other 
     30#       development utilities. For instance, a string such as "-Ic:\foo\inc 
     31#       -Ic:\foo\local\inc" is normalized to "-Ic:/foo/inc -Ic:/foo/local/inc". 
     32# 
     33#       Usage: opts=CS_PATH_NORMALIZE_EMBEDDED([$opts]) 
     34#------------------------------------------------------------------------------ 
     35AC_DEFUN([CS_PATH_NORMALIZE_EMBEDDED], 
     36[`echo "x$1" | tr '\\\\' '/' | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`]) 
     37 
     38 
     39 
     40#------------------------------------------------------------------------------ 
     41# CS_PATH_NORMALIZE_OUTPUT(COMMAND) 
     42#       Normalize all paths emitted by COMMAND by transliterating Windows/DOS 
     43#       backslashes to forward slashes.  Also collapses whitespace.  This is 
     44#       useful when the output of COMMAND may include embedded Windows-style 
     45#       paths since the backslashes in those paths could be incorrectly 
     46#       interpreted in the context of Makefiles or other development 
     47#       utilities. For instance, if COMMAND "pkg-config --cflags foo" emits 
     48#       "-Ic:\foo\inc -Ic:\foo\local\inc", the output is normalized to 
     49#       "-Ic:/foo/inc -Ic:/foo/local/inc". 
     50# 
     51#       Usage: opts=CS_PATH_NORMALIZE_OUTPUT([$cmd]) 
     52#------------------------------------------------------------------------------ 
     53AC_DEFUN([CS_PATH_NORMALIZE_OUTPUT], 
     54[`AC_RUN_LOG([$1]) | tr '\\\\' '/' | sed 's/   */ /g;s/^ //;s/ $//'`]) 
     55 
     56 
     57 
    2258#------------------------------------------------------------------------------ 
    2359# CS_PATH_NORMALIZE(STRING) 
    24 #       Normalize a pathname at run-time by transliterating Windows/DOS 
    25 #       backslashes to forward slashes.  Also collapses whitespace. 
     60#       DEPRECATED: Use CS_PATH_NORMALIZE_EMBEDDED() instead. 
    2661#------------------------------------------------------------------------------ 
    27 AC_DEFUN([CS_PATH_NORMALIZE], 
    28 [`echo "x$1" | tr '\\\\' '/' | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`]) 
     62AC_DEFUN([CS_PATH_NORMALIZE], [CS_PATH_NORMALIZE_EMBEDDED([$1])]) 
     63 
    2964 
    3065 
    3166#------------------------------------------------------------------------------ 
    3267# CS_RUN_PATH_NORMALIZE(COMMAND) 
    33 #       Normalize the pathname emitted by COMMAND by transliterating 
    34 #       Windows/DOS backslashes to forward slashes.  Also collapses whitespace. 
     68#       DEPRECATED: Use CS_PATH_NORMALIZE_OUTPUT() instead. 
    3569#------------------------------------------------------------------------------ 
    36 AC_DEFUN([CS_RUN_PATH_NORMALIZE], 
    37 [`AC_RUN_LOG([$1]) | tr '\\\\' '/' | sed 's/^x//;s/   */ /g;s/^ //;s/ $//'`]) 
     70AC_DEFUN([CS_RUN_PATH_NORMALIZE], [CS_PATH_NORMALIZE_OUTPUT([$1])]) 
     71 
     72 
     73 
     74#------------------------------------------------------------------------------ 
     75# CS_PATH_CANONICALIZE(PATH) 
     76#       Canonicalize PATH by transliterating Windows/DOS backslashes to forward 
     77#       slashes. On MSYS/MinGW, also converts MSYS-style paths 
     78#       (ex. /home/foo/bar/, /c/foo/bar) to proper Windows-style paths 
     79#       (ex. c:/msys/home/foo/bar, c:/foo/bar). This is important because an 
     80#       MSYS-style path is meaningful only to MSYS, but not to utilities which 
     81#       might be invoked by a Makefile or other build tool.  Such utilities 
     82#       invariably expect Windows-style paths. 
     83# 
     84#       Usage: path=CS_PATH_CANONICALIZE([$path]) 
     85#------------------------------------------------------------------------------ 
     86AC_DEFUN([CS_PATH_CANONICALIZE], 
     87    [$( 
     88    cs_indir=CS_PATH_NORMALIZE_EMBEDDED([$1]) 
     89    MSYS_AC_CANONICAL_PATH([cs_outdir], [$cs_indir]) 
     90    echo $cs_outdir 
     91    )]) 
     92 
     93 
     94 
     95#------------------------------------------------------------------------------ 
     96# MSYS_AC_CANONICAL_PATH(VAR, PATHNAME) 
     97#       Set VAR to the canonically resolved absolute equivalent of PATHNAME, 
     98#       (which may be a relative path, and need not refer to any existing 
     99#       entity). 
     100# 
     101#       On Win32-MSYS build hosts, the returned path is resolved to its true 
     102#       native Win32 path name (but with slashes, not backslashes). 
     103# 
     104#       On any other system, it is simply the result which would be obtained if 
     105#       PATHNAME represented an existing directory, and the pwd command was 
     106#       executed in that directory. 
     107# 
     108# Author: Keith Marshall <keith.marshall@total.com> 
     109# Source: http://article.gmane.org/gmane.comp.gnu.mingw.msys/2785 
     110#------------------------------------------------------------------------------ 
     111AC_DEFUN([MSYS_AC_CANONICAL_PATH], 
     112    [ac_dir="$2" 
     113    pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd 
     114    until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w` 
     115    do 
     116       ac_dir=`AS_DIRNAME(["$ac_dir"])` 
     117    done 
     118    ac_dir=`echo "$ac_dir" | sed 's?^[[./]]*??'` 
     119    ac_val=`echo "$ac_val" | sed 's?/*$[]??'` 
     120    $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"';s?/*$[]??'`]) 
     121 
     122 
     123 
     124#------------------------------------------------------------------------------ 
     125# CS_PATH_INIT 
     126#       Initialize commonly-used variable substitutions via AC_SUBST(). 
     127#       Present implementation publishes CS_TOP_SRCDIR and CS_TOP_BUILDDIR, 
     128#       which are canonicalized counterparts (via CS_PATH_CANONICALIZE()) of 
     129#       Autoconf's top_srcdir and top_builddir substitutions (ex: in source 
     130#       file, use @CS_TOP_SRCDIR@ rather than @top_srcdir@). 
     131#------------------------------------------------------------------------------ 
     132AC_DEFUN([CS_PATH_INIT], 
     133    [AC_SUBST([CS_TOP_SRCDIR], [CS_PATH_CANONICALIZE([$srcdir])]) 
     134    AC_SUBST([CS_TOP_BUILDDIR], [.]) 
     135    ]) 
  • cel/trunk/mk/jam/filelist.jam

    r3660 r3672  
    8383rule FileListEntryApplications 
    8484{ 
     85    $($(1)_TARGET)_FILELIST = $(2) ; 
    8586    Depends filelists : 
    8687      [ SystemDoFileListEntryApplications $(1) : $(2) ] ; 
     
    9091rule FileListEntryPlugin 
    9192{ 
     93    $($(1)_TARGET)_FILELIST = $(2) ; 
    9294    Depends filelists : 
    9395      [ SystemDoFileListEntryPlugin $(1) : $(2) ] ; 
  • cel/trunk/mk/jam/msi.jam

    r3660 r3672  
    7979} 
    8080 
    81 ## MSIPackage msifile : wxs [: preprocvars] 
     81## MSIPackage msifile : wxs [: preprocvars [: objfile]] 
    8282rule MSIPackage 
    8383{ 
     
    8787   
    8888  SEARCH on $(mod_src) = $(SEARCH_SOURCE) ; 
    89   local mod_obj = $(mod_src:S=.wixobj) ; 
     89  local mod_obj = $(4:E=$(mod_src:S=)) ; 
     90  mod_obj = $(mod_obj).wixobj ; 
    9091  MakeLocate $(mod_obj) : $(LOCATE.MSI.TEMP) ; 
    9192  Depends $(mod_obj) : $(mod_src) ; 
     
    9596   
    9697  Depends $(target) : $(mod_obj) ; 
     98  LIGHTFLAGS.EXTRA on $(target) = -cc $(LOCATE.MSI.TEMP)/cabinets -reusecab ; 
    9799  LinkWIXOBJ $(target) : $(mod_obj) ; 
    98100  Clean msiclean : $(target) ; 
     
    117119actions LinkWIXOBJ 
    118120{ 
    119   light $(WIX_FLAGS) $(LIGHTFLAGS) $(>) -out $(<) 
     121  light $(WIX_FLAGS) $(LIGHTFLAGS) $(LIGHTFLAGS.EXTRA) $(>) -out $(<) 
    120122} 
  • cel/trunk/mk/msvcgen/project7.tlib

    r3077 r3672  
    22#============================================================================== 
    33# TemplateToolkit2 template for MSVC7 project (vcproj) file. 
    4 # Copyright (C) 2004 by Eric Sunshine <sunshine@sunshineco.com> 
     4# Copyright (C) 2004,2008 by Eric Sunshine <sunshine@sunshineco.com> 
    55# 
    66#    This library is free software; you can redistribute it and/or modify it 
     
    2323  PROCESS projectx7.tlib; 
    2424 
    25   MACRO composedefs(defs) GET compose('defines', defs, ';'); 
     25  MACRO composedefs(defs) GET compose('defines', defs, ';').replace('"', '\\&quot;'); 
    2626  MACRO composedirs(tag, seed) GET composepaths(${"build.${tag}key"},seed,';'); 
    2727