Changeset 709


Ignore:
Timestamp:
Jun 24, 2007, 9:53:46 PM (13 years ago)
Author:
John Small
Message:
  • Update to have the SED command in the makefile autoamtically set

the version portion of the packageid in the WarpIN script.

  • Makefile also updated to allow a make from within the warpin

subdirectory.

Location:
trunk/warpin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/warpin/fm2.wis.in

    r708 r709  
    2626
    2727<PCK INDEX=1
    28   PACKAGEID="Netlabs\FM2\Base\3\6\0"
     28  PACKAGEID="Netlabs\FM2\Base@@@FM2_VER@@@"
    2929  TITLE="FM/2 - File Manager/2 (Base package)"
    3030  TARGET="$(WARPIN_DEFAULTTOOLSPATH)\FM2"
     
    6767
    6868The FM/2 base package must be installed to a drive with long filename support!
    69 This is the first release of FM/2 that was build with OpenWatcom. Changing 
    70 compilers can introduce unexpected problem so you may want to install this 
     69This is the first release of FM/2 that was build with OpenWatcom. Changing
     70compilers can introduce unexpected problem so you may want to install this
    7171package to a location different than your current install for testing before
    72 replacing your current version. See the readme for more information 
     72replacing your current version. See the readme for more information
    7373</PCK>
    7474
    7575<PCK INDEX=7
    76   PACKAGEID="Netlabs\FM2 Utilities\FM2Utils\1\1\0"
     76  PACKAGEID="Netlabs\FM2 Utilities\FM2Utils@@@FM2UTILS_VER@@@"
    7777  TITLE="FM/2 Utilities"
    7878  EXTERNAL="fm2utils@@@FM2UTILS_VER@@@.wpi"
     
    156156</WARPIN>
    157157
    158 <!--
    159   CREATEOBJECT="WPProgram|History|<FM3_Docs>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(1)\docs\history;OBJECTID=<FM2History>;"
    160   CREATEOBJECT="WPProgram|GNU General Public License|<FM3_Docs>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(1)\docs\copying;OBJECTID=<FM3Copying>;"
    161   CREATEOBJECT="WPShadow|History (Shadow)|<FM3_Docs>|SHADOWID=$(1)\docs\history;OBJECTID=<FM2HistoryShadow>;"
    162   CREATEOBJECT="WPProgram|Read Me|<FM3_Docs>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(1)\docs\readme;OBJECTID=<FM3Readme>;"
    163   CREATEOBJECT="WPProgram|FM/2 Utils Doc|<FM2_Utilities>|EXENAME=E.EXE;PROGTYPE=PM;PARAMETERS=$(7)\fm2utils.doc;OBJECTID=<FM2UtilsDoc>;"
    164 
    165 <WARPIN VERSION 1.0.15>
    166 
    167 <PCK INDEX=3
    168   PACKAGEID="Netlabs\FM2\FM/2 Tools\3\6\0\20070624"
    169   TITLE="Standalone FM/2 Tools"
    170   TARGET="$(1)"
    171   EXTERNAL="FM2Utilx.wpi"
    172   SELECT
    173   REQUIRES=1
    174   FIXED
    175   CREATEOBJECT="WPFolder|FM/2 Tools|<FM3_Folder>|ICONFILE=$(1)\icons\toolbox.ICO;ICONNFILE=1,$(1)\icons\toolbox2.ICO;OBJECTID=<FM3_Tools>;"
    176   CREATEOBJECT="WPProgram|Archive Viewer/2|<FM3_Tools>|EXENAME=$(1)\FM2Tools\AV2.EXE;PROGTYPE=PM;PARAMETERS=%*;STARTUPDIR=$(1);TITLE=Archive Viewer/2;OBJECTID=<FM/2_AV/2>;"
    177   CREATEOBJECT="WPProgram|Bookshelf Viewer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VIEWINFS.EXE;TITLE=Bookshelf Viewer;STARTUPDIR=$(1);OBJECTID=<FM/2_BOOKSHELF>;"
    178   CREATEOBJECT="WPProgram|Collector|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VCOLLECT.EXE;TITLE=Collector;STARTUPDIR=$(1);OBJECTID=<FM/2_VCOLLECT>;"
    179   CREATEOBJECT="WPProgram|Databar|<FM3_Tools>|EXENAME=$(1)\FM2Tools\DATABAR.EXE;TITLE=Databar;STARTUPDIR=$(1);OBJECTID=<FM/2_DATABAR>;"
    180   CREATEOBJECT="WPProgram|Dir Sizes|<FM3_Tools>|EXENAME=$(1)\FM2Tools\DIRSIZE.EXE;PARAMETERS=%*;STARTUPDIR=$(1);TITLE=Dir Sizes;OBJECTID=<FM/2_DIRSIZE>;"
    181   CREATEOBJECT="WPProgram|EA Viewer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\EAS.EXE;PARAMETERS=%*;STARTUPDIR=$(1);TITLE=EA Viewer;OBJECTID=<FM/2_EAVIEW>;"
    182   CREATEOBJECT="WPProgram|FM/2 Utilities command line|<FM3_Tools>|EXENAME=?:\OS2\CMD.EXE;STARTUPDIR=?:\;PROGTYPE=WINDOWABLEVIO;PARAMETERS=/K $(1)\SETENV.CMD"
    183   CREATEOBJECT="WPProgram|Global File Viewer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\GLOBAL.EXE;TITLE=Global File Viewer;STARTUPDIR=$(1);OBJECTID=<FM/2_SEEALL>;"
    184   CREATEOBJECT="WPProgram|Helpfile Viewer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VIEWINFS.EXE;STARTUPDIR=$(1);TITLE=Helpfile Viewer;OBJECTID=<FM2ViewInf>;"
    185   CREATEOBJECT="WPProgram|INI Viewer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\INI.EXE;STARTUPDIR=$(1);PROGTYPE=PM;PARAMETERS=%*;ASSOCFILTER=*.INI,,;OBJECTID=<FM/2_INIVIEW>;"
    186   CREATEOBJECT="WPProgram|Process Killer|<FM3_Tools>|EXENAME=$(1)\FM2Tools\KILLPROC.EXE;PARAMETERS=%*;TITLE=Process Killer;STARTUPDIR=$(1);OBJECTID=<FM/2_KILLPROC>;"
    187   CREATEOBJECT="WPProgram|Undeleter|<FM3_Tools>|EXENAME=$(1)\FM2Tools\UNDEL.EXE;PARAMETERS=%*;TITLE=Undeleter;STARTUPDIR=$(1);OBJECTID=<FM/2_UNDEL>;"
    188   CREATEOBJECT="WPProgram|Seek and scan|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VCOLLECT.EXE;TITLE=Seek and scan;PARAMETERS=**;STARTUPDIR=$(1);OBJECTID=<FM/2_VSEEK>;"
    189   CREATEOBJECT="WPProgram|Visual Directory|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VDIR.EXE;PARAMETERS=%*;STARTUPDIR=$(1);OBJECTID=<FM/2_VDIR>;"
    190   CREATEOBJECT="WPProgram|Visual Tree|<FM3_Tools>|EXENAME=$(1)\FM2Tools\VTREE.EXE;TITLE=Visual Tree;STARTUPDIR=$(1);OBJECTID=<FM/2_VTREE>;"
    191   EXECUTE="$(1)\utilsmgr /UNATTENDED"
    192   DEEXECUTE="$(1)\utilsmgr /DELETE /UNATTENDED"
    193 
    194 >This package installs a number of FM/2's tools
    195 as stand alone programs.  These tools are all
    196 built into FM/2, but can be configured to run
    197 as separate programs for people who prefer to
    198 use them this way.
    199 </PCK>
    200 
    201 <PCK INDEX=10
    202   PACKAGEID="Netlabs\FM2\Reset FM/2 Customizations\3\6\0\20070624"
    203   TITLE="Reset all FM/2 customizations to default values"
    204   TARGET="$(1)"
    205   EXTERNAL="FM2Utilx.wpi"
    206   REQUIRES=1
    207   EXECUTE="$(1)\cfgmgr /INSTALL /DEFAULTS /UNATTENDED"
    208   DEEXECUTE="$(1)\cfgmgr /DEINSTALL /DEFAULTS /UNATTENDED"
    209 
    210 >This package resets ALL FM/2 customizations
    211 to their default values. All customizations
    212 you may have made will be lost. DO NOT select
    213 this package unless this is what you desire.
    214 </PCK>
    215 
    216 -->
  • trunk/warpin/makefile

    r703 r709  
    1010#               and the base makefile. Also made the fm2.wis file a
    1111#               dependant of the WPI target.
     12
     13!ifndef FM2_VER                  # if defined on wmake command, use it
     14FM2_VER=-3-6-0                   # default value
     15!ifdef %FM2_VER                  # if defined via env. var.
     16FM2_VER=$(%FM2_VER)              #     use the env. var.
     17!endif
     18!endif
     19
     20# FM2UTILS_VER defines the fm2utils WPI file name suffix.
     21# e.g. FM2UTILS_VER=-1-0 results in FM2Utils-1.0.wpi being built
     22# If FM2UTILS_VER is empty, then FM2UTILS.wpi is built
     23# NOTE: Start the variable with '-'
     24
     25!ifndef FM2UTILS_VER             # if defined on wmake command, use it
     26FM2UTILS_VER=-1-1                # default value
     27!ifdef %FM2UTILS_VER             # if defined via env. var.
     28FM2UTILS_VER=$(%FM2UTILS_VER)    #     use the env. var.
     29!endif
     30!endif
     31
     32# If BUILD_FM2UTILS = 1, build FM2UTILS*.wpi and FM2*.wpi
     33# Otherwise build just FM2*.wpi
     34
     35!ifndef BUILD_FM2UTILS           # if defined on wmake command, use it
     36!ifdef %BUILD_FM2UTILS           # else if defined via env. var.
     37!ifneq %BUILD_FM2UTILS 1         #     if env. var. is anything but 1
     38BUILD_FM2UTILS=0                 #     use a value of 0
     39!else
     40BUILD_FM2UTILS=1
     41!endif
     42!else
     43BUILD_FM2UTILS=0                 # use default value if not defined via env. or command line
     44!endif
     45!endif
    1246
    1347
     
    2559    ckfiles fm2$(FM2_VER).wpi
    2660
    27 fm2.wis: fm2.wis.in fm2utils\fm2utils.doc fm2utils\license.txt
    28 #  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
    29    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
     61fm2.wis: fm2.wis.in sed.in fm2utils\fm2utils.doc fm2utils\license.txt
     62#  sed -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@@@//" -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "/PACKAGEID/s/-/\\/g" fm2.wis.in >fm2.wis
     63   sed -e "s/@@@FM2UTILS_VER@@@/$(FM2UTILS_VER)/" -e "s/@@@FM2_VER@@@/$(FM2_VER)/" -e "/PACKAGEID/s/-/\\/g" -f sed.in fm2.wis.in >fm2.wis
    3064
    3165fm2$(FM2_VER).wpi:: bld_fm2_wpidirs.in
Note: See TracChangeset for help on using the changeset viewer.