Changeset 699


Ignore:
Timestamp:
Jun 17, 2007, 1:00:43 PM (18 years ago)
Author:
John Small
Message:
  • Apparently WMAKE considers '#', even within double quotes, to be

a comment. So the search strings used by SED to insert files and
macro values into FM2.WIS were changed so that '#' were no longer
used as delimiters of these strings.

Location:
trunk/warpin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/warpin/fm2.wis.in

    r680 r699  
    1919<HEAD>
    2020<REXX NAME=UtilsCheck>
    21    if stream(WirexxGetEnv('WI_ARCHIVE_PATH') || '\fm2utils###FM2UTILS_VER###.wpi', 'c', 'query exists') = '' then
     21   if stream(WirexxGetEnv('WI_ARCHIVE_PATH') || '\fm2utils@@@FM2UTILS_VER@@@.wpi', 'c', 'query exists') = '' then
    2222      return '3'
    2323   else
    … …  
    7272  PACKAGEID="Netlabs\FM2 Utilities\FM2Utils\1\0\0"
    7373  TITLE="FM/2 Utilities"
    74   EXTERNAL="fm2utils###FM2UTILS_VER###.wpi"
     74  EXTERNAL="fm2utils@@@FM2UTILS_VER@@@.wpi"
    7575  TARGET="$(1)\Utils"
    7676  SELECT
    … …  
    123123<NEXTBUTTON TARGET=6>~Next</NEXTBUTTON>
    124124<TEXT>FM/2 Utilities: A short description of each utility is included at the end of the readme below. A special note of thanks to Mark Kimes for making these utilities freely available.</TEXT>
    125 <README>###include fm2utils.doc###
     125<README>@@@include fm2utils.doc@@@
    126126</README>
    127127</PAGE>
    … …  
    130130<NEXTBUTTON TARGET=7>~I agree</NEXTBUTTON>
    131131<TEXT>FM/2 Utilities: By pressing the "I agree" button, you agree to all terms and conditions of the license agreement below.</TEXT>
    132 <README>###include license.txt###
     132<README>@@@include license.txt@@@
    133133</README>
    134134</PAGE>

  • trunk/warpin/makefile

    r694 r699  
    5050
    5151fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt
    52    sed -e "s/###FM2UTILS_VER###/$(FM2UTILS_VER)/" -e "/###include fm2utils.doc###/r fm2utils\fm2utils.doc" -e "s/###include fm2utils.doc###//g" -e "/###include license.txt###/r fm2utils\license.txt" -e "s/###include license.txt###//g" fm2.wis.in >fm2.wis
     52#  sed -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -e "/@@@include fm2utils.doc@@@/r fm2utils\fm2utils.doc" -e "s/@@@include fm2utils.doc@@@//g" -e "/@@@include license.txt@@@/r fm2utils\license.txt" -e "s/@@@include license.txt@@@//g" fm2.wis.in >fm2.wis
     53   sed -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -e "/@@@include fm2utils.doc@@@/r fm2utils\fm2utils.doc" -e "s/@@@include fm2utils.doc@@@//" -e "/@@@include license.txt@@@/r fm2utils\license.txt" -e "s/@@@include license.txt@@@//" fm2.wis.in >fm2.wis
    5354
    5455fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
Note: See TracChangeset for help on using the changeset viewer.