Changeset 196


Ignore:
Timestamp:
Feb 16, 2017, 5:42:13 PM (8 years ago)
Author:
Valery V. Sedletski
Message:

packages: Packaging fix.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/src/lib/fat32_010.wis

    r169 r196  
    127127  PACKAGEID="NetLabs\FAT32.IFS\MAIN_FS\0\10\1"
    128128  TITLE="FAT32.IFS Main driver"
    129   TARGET="=("FindPath NetLabs\ESES\DrvPck CONFIG DEFAULT ?:\OS2\BOOT")"
     129  TARGET="=("FindPath NetLabs\ESES\DrvPck CONFIG DEFAULT ?:\os2\boot")"
    130130  SELECT
    131131  NODESELECT
    132   CONFIGSYS="IFS=$(1)\FAT32.IFS /CACHE:2048 /H /Q /AC:* /LARGEFILES | UNIQUE(FAT32.IFS) ADDAFTER(HPFS.IFS)"
     132  CONFIGSYS="ifs=$(1)\fat32.ifs /cache:2048 /h /q /ac:* /largefiles | UNIQUE(fat32.ifs) ADDAFTER(hpfs.ifs)"
    133133></PCK>
    134134
    … …  
    136136  PACKAGEID="NetLabs\FAT32.IFS\DLL\0\10\1"
    137137  TITLE="Dynamic Link Library - Filesystem utilities"
    138   TARGET="=("FindPath NetLabs\ESES\LibPck CONFIG DEFAULT ?:\OS2\DLL")"
     138  TARGET="=("FindPath NetLabs\ESES\LibPck CONFIG DEFAULT ?:\os2\dll")"
    139139  SELECT
    140140  NODESELECT
    … …  
    145145  PACKAGEID="NetLabs\FAT32.IFS\BIN\0\10\1"
    146146  TITLE="Cache and other support programs"
    147   TARGET="=("FindPath NetLabs\ESES\BinPck CONFIG DEFAULT ?:\OS2")"
     147  TARGET="=("FindPath NetLabs\ESES\BinPck CONFIG DEFAULT ?:\os2")"
    148148  SELECT
    149149  NODESELECT
    150150  CONFIGSYS="SET PATH=$(3);|ADDRIGHT"
    151   CONFIGSYS="CALL=$(3)\CACHEF32.EXE /F /P:2 /M:50000 /B:250 /D:5000 | UNIQUE(CACHEF32.EXE) ADDAFTER(FAT32.IFS)"
     151  CONFIGSYS="call=$(3)\cachef32.exe /f /p:2 /m:50000 /b:250 /d:5000 | UNIQUE(cachef32.exe) ADDAFTER(fat32.ifs)"
    152152>
    153153</PCK>
    … …  
    156156  PACKAGEID="NetLabs\FAT32.IFS\INF\0\10\1"
    157157  TITLE="FAT32.IFS IPF documentation"
    158   TARGET="=("FindPath NetLabs\ESES\INFPck CONFIG DEFAULT ?:\OS2\BOOK")"
    159   SELECT
    160   NODESELECT
    161   CREATEOBJECT="WPProgram|=("ObjTitle 1")|=("FindObject <ESE_BOOKS> <WP_INFO>")|EXENAME=VIEW.EXE;STARTUPDIR=$(4);PARAMETERS=$(4)\FAT32.INF;OBJECTID=<FAT32_INF>;"
     158  TARGET="=("FindPath NetLabs\ESES\INFPck CONFIG DEFAULT ?:\os2\book")"
     159  FIXED
     160  CREATEOBJECT="WPProgram|=("ObjTitle 1")|=("FindObject <ESE_BOOKS> <WP_INFO>")|EXENAME=view.exe;STARTUPDIR=$(4);PARAMETERS=$(4)\fat32.inf;OBJECTID=<FAT32_INF>;"
    162161>
    163162</PCK>
    … …  
    166165  PACKAGEID="NetLabs\FAT32.IFS\TXT\0\10\1"
    167166  TITLE="FAT32.IFS Plaintext documentation"
    168   TARGET="=("FindPath NetLabs\ESES\TxtPck CONFIG DEFAULT ?:\OS2\DOCS\FAT32")"
    169   SELECT
    170   NODESELECT
    171   CREATEOBJECT="WPProgram|=("ObjTitle 2")|=("FindObject <ESE_DOCS> <WP_INFO>")|EXENAME=E.EXE;STARTUPDIR=$(5);PARAMETERS=$(5)\FAT32.TXT;OBJECTID=<FAT32_TXT>;"
     167  TARGET="=("FindPath NetLabs\ESES\TxtPck CONFIG DEFAULT ?:\os2\docs\fat32")"
     168  FIXED
     169  CREATEOBJECT="WPProgram|=("ObjTitle 2")|=("FindObject <ESE_DOCS> <WP_INFO>")|EXENAME=E.EXE;STARTUPDIR=$(5);PARAMETERS=$(5)\fat32.txt;OBJECTID=<FAT32_TXT>;"
    172170>
    173171</PCK>
    … …  
    176174   PACKAGEID="NetLabs\FAT32.IFS\Korean support\0\10\1"
    177175   TITLE="Korean doc and corrected COUNTRY.SYS"
    178    TARGET="?:\OS2"
     176   TARGET="?:\os2"
    179177   FIXED
    180    CREATEOBJECT="WPShadow|FAT32.KOR|=("FindObject <ESE_BOOKS> <WP_REFCMDFOLDER>")|SHADOWID=$(6)\DOCS\FAT32\FAT32.KOR;OBJECTID=<FAT32_KOR_SHADOW>;"
     178   CREATEOBJECT="WPShadow|fat32.kor|=("FindObject <ESE_BOOKS> <WP_REFCMDFOLDER>")|SHADOWID=$(6)\docs\fat32\fat32.kor;OBJECTID=<FAT32_KOR_SHADOW>;"
    181179>Korean support for non-Korean systems.
    182180</PCK>
    … …  
    185183   PACKAGEID="NetLabs\FAT32.IFS\Optional drivers\0\10\1"
    186184   TITLE="Optional drivers (patched version of os2dasd.dmd and partfilt.flt)"
    187    TARGET="?:\OS2\BOOT"
    188185   FIXED
     186   TARGET="?:\os2\boot"
    189187></PCK>
    190188
    … …  
    192190   PACKAGEID="NetLabs\FAT32.IFS\Debug symbols\0\10\1"
    193191   TITLE="Debug symbols for all binaries"
    194    TARGET="?:\OS2"
    195192   FIXED
    196 ></PCK>
     193   TARGET="?:\os2"
     194></PCK>
     195
     196<PCK INDEX=9
     197   PACKAGEID="NetLabs\FAT32.IFS\Optional drivers' sym files\0\10\1"
     198   TITLE="Optional drivers' symbol files"
     199   FIXED
     200   TARGET="?:\os2\boot"
     201></PCK>
     202
     203<PCK INDEX=10
     204   PACKAGEID="NetLabs\FAT32.IFS\Optional drivers' doc files\0\10\1"
     205   TITLE="Optional drivers' documentation files"
     206   FIXED
     207   TARGET="?:\os2\docs\fat32"
     208></PCK>
     209
     210<PCK INDEX=11
     211  PACKAGEID="NetLabs\FAT32.IFS\IFS INF\0\10\1"
     212  TITLE="The updated Installable File System document"
     213  FIXED
     214  TARGET="=("FindPath NetLabs\ESES\INFPck CONFIG DEFAULT ?:\os2\book")"
     215  CREATEOBJECT="WPProgram|=("ObjTitle 3")|=("FindObject <ESE_BOOKS> <WP_INFO>")|EXENAME=VIEW.EXE;STARTUPDIR=$(11);PARAMETERS=$(11)\ifs.inf;OBJECTID=<IFS_INF>;"
     216>
     217</PCK>
    197218
    198219</HEAD>

  • TabularUnified trunk/src/makefile.mk

    r193 r196  
    1717CLEANUP  = $(PROJ_BLD)\*.obj $(PROJ_BLD)\*.obd $(PROJ_BLD)\*.lnk $(PROJ_BLD)\*.wmp &
    1818           $(PROJ_BLD)\*.map $(PROJ_BLD)\*.ols $(PROJ_BLD)\*.err $(BLDROOT)\..\include\ver.h &
    19            $(BLDROOT)\lib\*.lib $(BINROOT)\zip.flg $(BINROOT)\wpi.flg
     19           $(BLDROOT)\lib\*.lib $(BINROOT)\zip-*.flg $(BINROOT)\wpi.flg
    2020
    2121mainifs  = &
    … …  
    3333 f32chk.exe &
    3434 fat32chk.exe &
    35  fat32fmt.exe
     35 fat32fmt.exe &
     36 fat32sys.exe
    3637
    3738inf      = &
    3839 fat32.inf
    3940
     41ifsinf   = &
     42 ifs.inf
     43
    4044docs     = &
    41  partfilt.doc build.txt &
     45 build.txt message.txt &
    4246 deamon.txt fat32.txt lesser.txt &
    4347 license.txt os2fat32.txt problems.txt &
    44  partfilt.txt message.txt
    4548
    4649korean   = &
    … …  
    5154
    5255sym      = &
    53  boot\fat32.sym dll\ufat32.sym boot\partfilt.sym &
     56 boot\fat32.sym dll\ufat32.sym &
    5457 cachef32.sym diskdump.sym diskinfo.sym f32mon.sym &
    55  f32stat.sym f32chk.sym fat32chk.sym fat32fmt.sym
     58 f32stat.sym f32chk.sym fat32chk.sym fat32fmt.sym fat32sys.sym
     59
     60adddrvsym = &
     61 boot\partfilt.sym
     62
     63adddrvdoc = &
     64 partfilt.doc partfilt.txt
    5665
    5766distlist = &
    … …  
    6877 $(p)os2\fat32chk.exe $(p)os2\fat32chk.sym &
    6978 $(p)os2\fat32fmt.exe $(p)os2\fat32fmt.sym &
    70  $(p)os2\book\fat32.inf &
     79 $(p)os2\fat32sys.exe $(p)os2\fat32sys.sym &
     80 $(p)os2\book\fat32.inf $(p)os2\book\ifs.inf &
    7181!endif
    7282 $(p)os2\docs\fat32\partfilt.doc $(p)os2\docs\fat32\build.txt &
    … …  
    8191dist = $+ $(distlist) $-
    8292
     93distlist2 = &
     94 $(p)win32\dll\ufat32.dll $(p)win32\dll\ufat32.sym &
     95 $(p)win32\fat32chk.exe $(p)win32\fat32chk.sym &
     96 $(p)win32\fat32fmt.exe $(p)win32\fat32fmt.sym &
     97 $(p)win32\fat32sys.exe $(p)win32\fat32sys.sym
     98p = $(BINROOT)\
     99distfiles2 = $+ $(distlist2) $-
     100p =
     101dist2 = $+ $(distlist2) $-
     102
    83103distname  = fat32-$(_VER)-r$(%SVNREV)
    84 distfile1 = $(distname).zip
    85 distfile2 = $(distname).wpi
     104distfile1 = $(distname)-os2.zip
     105distfile2 = $(distname)-os2.wpi
     106distfile3 = $(distname)-win32.zip
    86107
    87108AS=wasm
    … …  
    104125
    105126all: $(BLDROOT)\bld.flg $(PROJ_BLD)\makefile.wcc dirs copy targets &
    106      $(BINROOT)\zip.flg $(BINROOT)\wpi.flg .symbolic
     127     $(BINROOT)\zip-os2.flg $(BINROOT)\zip-win32.flg $(BINROOT)\wpi.flg .symbolic
    107128
    108129targets: .symbolic
    … …  
    119140 @wtouch $^@
    120141
    121 $(BINROOT)\zip.flg: $(distfiles)
     142$(BINROOT)\zip-os2.flg: $(distfiles)
    122143 @echo ZIP      $(distfile1)
    123144 @cd $(BINROOT)
    124  @zip -r $(distfile1) $(dist) >zip.flg 2>&1
     145 @zip -r $(distfile1) $(dist) >zip-os2.flg 2>&1
    125146 @cd ..\$(PROJ)
    126147
    … …  
    128149 @echo WIC      $(distfile2)
    129150 @cd $(BINROOT)
    130  @%create $(distname).pkg
    131  @%append $(distname).pkg $(distfile2) -a 1 -c.\os2\boot
    132  @for %file in ($(mainifs)) do @if exist os2\boot\%file @%append $(distname).pkg %file
    133  @%append $(distname).pkg 2 -c.\os2\dll
    134  @for %file in ($(dll)) do @if exist os2\dll\%file @%append $(distname).pkg %file
    135  @%append $(distname).pkg 3 -c.\os2
    136  @for %file in ($(util)) do @if exist os2\%file @%append $(distname).pkg %file
    137  @%append $(distname).pkg 4 -c.\os2\book
    138  @for %file in ($(inf)) do @if exist os2\book\%file @%append $(distname).pkg %file
    139  @%append $(distname).pkg 5 -c.\os2\docs\fat32
    140  @for %file in ($(docs)) do @if exist os2\docs\fat32\%file @%append $(distname).pkg %file
    141  @%append $(distname).pkg 6 -c.\os2
    142  @for %file in ($(korean)) do @if exist os2\%file @%append $(distname).pkg %file
    143  @%append $(distname).pkg 7 -c.\os2\boot
    144  @for %file in ($(adddrv)) do @if exist os2\boot\%file @%append $(distname).pkg %file
    145  @%append $(distname).pkg 8 -c.\os2
    146  @for %file in ($(sym)) do @if exist os2\%file @%append $(distname).pkg %file
    147  @%append $(distname).pkg -s ..\lib\fat32_010.wis
    148  @$(WIC) @$(distname).pkg >wpi.flg 2>&1
     151 @%create $(distname)-os2.pkg
     152 @%append $(distname)-os2.pkg $(distfile2) -a 1 -c.\os2\boot
     153 @for %file in ($(mainifs)) do @if exist os2\boot\%file @%append $(distname)-os2.pkg %file
     154 @%append $(distname)-os2.pkg 2 -c.\os2\dll
     155 @for %file in ($(dll)) do @if exist os2\dll\%file @%append $(distname)-os2.pkg %file
     156 @%append $(distname)-os2.pkg 3 -c.\os2
     157 @for %file in ($(util)) do @if exist os2\%file @%append $(distname)-os2.pkg %file
     158 @%append $(distname)-os2.pkg 4 -c.\os2\book
     159 @for %file in ($(inf)) do @if exist os2\book\%file @%append $(distname)-os2.pkg %file
     160 @%append $(distname)-os2.pkg 5 -c.\os2\docs\fat32
     161 @for %file in ($(docs)) do @if exist os2\docs\fat32\%file @%append $(distname)-os2.pkg %file
     162 @%append $(distname)-os2.pkg 6 -c.\os2
     163 @for %file in ($(korean)) do @if exist os2\%file @%append $(distname)-os2.pkg %file
     164 @%append $(distname)-os2.pkg 7 -c.\os2\boot
     165 @for %file in ($(adddrv)) do @if exist os2\boot\%file @%append $(distname)-os2.pkg %file
     166 @%append $(distname)-os2.pkg 8 -c.\os2
     167 @for %file in ($(sym)) do @if exist os2\%file @%append $(distname)-os2.pkg %file
     168 @%append $(distname)-os2.pkg 9 -c.\os2
     169 @for %file in ($(adddrvsym)) do @if exist os2\%file @%append $(distname)-os2.pkg %file
     170 @%append $(distname)-os2.pkg 10 -c.\os2\docs\fat32
     171 @for %file in ($(adddrvdoc)) do @if exist os2\docs\fat32\%file @%append $(distname)-os2.pkg %file
     172 @%append $(distname)-os2.pkg 11 -c.\os2\book
     173 @for %file in ($(ifsinf)) do @if exist os2\book\%file @%append $(distname)-os2.pkg %file
     174 @%append $(distname)-os2.pkg -s ..\lib\fat32_010.wis
     175 @$(WIC) @$(distname)-os2.pkg >wpi.flg 2>&1
     176 @cd ..\$(PROJ)
     177
     178$(BINROOT)\zip-win32.flg: $(distfiles2)
     179 @echo ZIP      $(distfile3)
     180 @cd $(BINROOT)
     181 @zip -r $(distfile3) $(dist2) >zip-win32.flg 2>&1
    149182 @cd ..\$(PROJ)
    150183

  • TabularUnified trunk/src/mapsym.awk

    r128 r196  
    55# Feb 27, 2014, valerius
    66# Added support for 16-bit NE executables
     7# Feb 15, 2017, valerius
     8# Added support for 32-bit PE executables
    79
    810BEGIN {
    … …  
    2830
    2931/^Entry point address:/ {
    30  printf "\nProgram entry point at %s", $4
     32 if (length($4) == 8)
     33   printf "\nProgram entry point at %s:%s", "0001", $4
     34 else
     35   printf "\nProgram entry point at %s", $4
    3136}
    3237
    … …  
    3439 mode=group
    3540 groups=0
     41 next
    3642}
    3743
    … …  
    6470}
    6571
     72/^[^= ]* *....:....  *........$/ {
     73 if(mode==group)
     74 {
     75  group_buf[groups++]=sprintf(" %s   %s", toupper($2), $1)
     76 }
     77}
     78
    6679/^[^= ]* *....:........  *........$/ {
    6780 if(mode==group)
    … …  
    7184}
    7285
    73 /^[^= ]* *....:....  *........$/ {
     86/^[^= ]* *........  *........$/ {
    7487 if(mode==group)
    7588 {
    76   group_buf[groups++]=sprintf(" %s   %s", toupper($2), $1)
     89  group_buf[groups++]=sprintf(" %s:%s   %s", "0001", toupper($2), $1)
    7790 }
    7891}
    … …  
    89102 {
    90103  printf " %s 0%sH %-22s %s 32-bit\n", toupper($4), toupper($5), $1, $2
     104 }
     105}
     106
     107/^[^= ]* *[^ ]* *[^ ]*  *........  *........$/ {
     108 if(mode==segment && length($4) == 8)
     109 {
     110  printf " %s:%s 0%sH %-22s %s 32-bit\n", "0001", toupper($4), toupper($5), $1, $2
    91111 }
    92112}
    … …  
    108128}
    109129
     130/^[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]\*?  *[^ ]*$/ {
     131 if(mode==memory)
     132 {
     133  printf " %s:%s       %s\n", "0001", toupper(substr($1, 1, 8)), $2
     134 }
     135}
     136
    110137{
    111138 next
Note: See TracChangeset for help on using the changeset viewer.