Ignore:
Timestamp:
Feb 10, 2017, 2:50:49 AM (9 years ago)
Author:
David Azarewicz
Message:

Build system cleanup

Location:
GPL/branches/uniaud32-2.1.x/tools
Files:
2 added
1 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud32-2.1.x/tools/mkversion.cmd

    r576 r588  
    22 * Set time/date/hostname for uniaud build environment
    33 */
     4call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs';
     5call SysLoadFuncs;
    46
    5 parse arg sAlsaBase
     7parse arg sDebugMode;
    68
    79/* I don't this will ever change from Netlabs */
    8 projVendor    = "Netlabs"
    9 projProduct   = "OS/2 Universal Audio 32 Driver"
    10 projVendorNam = "Netlabs <www.netlabs.org>"
    11 projAdapter   = "OS/2 Universal Audio"
    12 
     10projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs');
     11projProduct   = "OS/2 Universal Audio 32 Driver";
     12projVendorNam = "Netlabs <www.netlabs.org>";
     13projAdapter   = "OS/2 Universal Audio";
    1314
    1415/* uniaud.inc is located in the base gpl directory and
    … …  
    1617 * written to include\version.h.
    1718 */
    18 if sAlsaBase = "" then sAlsaBase = "."
    19 versConst = sAlsaBase"\uniaud.inc"
     19sAlsaBase = Directory();
     20versConst = sAlsaBase||"\uniaud.inc";
    2021
    21 versMak   = sAlsaBase"\include\version.mak"
    22 versHdr   = sAlsaBase"\include\version.h"
    23 AlsaVersHdr = sAlsaBase'\alsa-kernel\include\sound\version.h'
     22versMak   = sAlsaBase||"\include\version.mak";
     23versHdr   = sAlsaBase||"\include\version.h";
     24AlsaVersHdr = sAlsaBase||'\alsa-kernel\include\sound\version.h';
    2425
    2526/* get and format date and time */
    26 curDate    = DATE('S')
    27 projDate   = RIGHT(curDate, 2)"."SUBSTR(curDate, 5, 2)"."LEFT(curDate, 4)
    28 projDate2  = LEFT(curDate, 4)SUBSTR(curDate, 5, 2)RIGHT(curDate, 2)L
    29 projTime   = TIME( )
     27curDate    = DATE('S');
     28projDate   = RIGHT(curDate, 2)||"."||SUBSTR(curDate, 5, 2)||"."||LEFT(curDate, 4);
     29projDate2  = LEFT(curDate, 4)||SUBSTR(curDate, 5, 2)||RIGHT(curDate, 2)L
     30projTime   = TIME( );
    3031
    31 /* get hostname for build system */
    32 projHost = VALUE('HOSTNAME',,'OS2ENVIRONMENT')
     32if (sDebugMode<>'') then do
     33  say "Project date: "projDate
     34  say "Project time: "projTime
     35  say "Inc File:     "versConst
     36  say "Version Mak:   "versMak
     37  say "Version Hdr:   "versHdr
     38end
    3339
    34 projString = left(Date() TIME(),25)left(projHost,10)
     40LINEIN(versConst,,0);
    3541
    36 say "Project date: "projDate
    37 say "Project time: "projTime
    38 say "hostname:     "projHost
    39 say "Version In:    "versConst
    40 say "Version Mak:   "versMak
    41 say "Version Hdr:   "versHdr
    42 
    43 LINEIN(versConst,,0)
    44 
    45 fixpack = ''
     42fixpack = '';
    4643
    4744do while(LINES(versConst))
    48     tmpLine = LINEIN(versConst)
     45  tmpLine = LINEIN(versConst);
    4946
    50     IF POS('#', tmpline) = 1 Then iterate
     47  IF POS('#', tmpline) = 1 Then iterate;
    5148
    52     opLoc = POS('BUILDVERSION', tmpLine)
    53     if opLoc > 0 then
    54       versionIn = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
     49  opLoc = POS('BUILDVERSION', tmpLine);
     50  if opLoc > 0 then
     51    versionIn = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    5552
    56     opLoc = POS('PRODUCTNAME', tmpLine)
    57     if opLoc > 0 then
    58       productName = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
     53  opLoc = POS('PRODUCTNAME', tmpLine)
     54  if opLoc > 0 then
     55    productName = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    5956
    60     opLoc = POS('FIXPACK', tmpLine)
    61     if opLoc > 0 then
    62       fixpack = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    63 
     57  opLoc = POS('FIXPACK', tmpLine)
     58  if opLoc > 0 then
     59    fixpack = STRIP((RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS("=", tmpLine)+1) ))), B, ' ')
    6460end
    6561
    66 if versionIn = "" then do
    67     say "Could not find Version in "versConst
    68     exit
     62if (sDebugMode<>'') then say 'versionIn='||versionIn;
     63
     64if (versionIn = "") then do
     65  say "Could not find Version in "||versConst;
     66  exit;
    6967end
    7068
    … …  
    7270
    7371if fixpack="" then
    74         projVers  = versionIn
     72  projVers = versionIn;
    7573else
    76         projVers  = versionIn'-'fixpack
     74  projVers = versionIn||'-'||fixpack;
    7775
    78 projVers2 = major||minor||projVersion
     76projVers2 = major||minor||projVersion;
    7977
    8078LINEIN(AlsaVersHdr,,0)
    … …  
    8381
    8482do while(LINES(AlsaVersHdr))
    85     tmpLine = LINEIN(AlsaVersHdr)
    86     opLoc = POS('#define CONFIG_SND_VERSION', tmpLine)
    87     if opLoc > 0 then
    88       AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"')
     83  tmpLine = LINEIN(AlsaVersHdr)
     84  opLoc = POS('#define CONFIG_SND_VERSION', tmpLine)
     85  if opLoc > 0 then AlsaLevel = STRIP(RIGHT(tmpLine, ( LENGTH(tmpLine) - (POS('"', tmpLine)))),,'"')
    8986end
    9087
    91 SAY 'Alsalevel = ' AlsaLevel
     88if (sDebugMode<>'') then do
     89  SAY 'Alsalevel='||AlsaLevel;
     90  say 'ProjVendor='||ProjVendor;
     91  say 'versionIn='||versionIn;
     92  say 'ProjString='||ProjString;
     93  say 'alsalevel='||alsalevel;
     94  say 'ProjVersion='||ProjVersion;
     95  say 'projVers='||projVers;
     96  say 'projVers2='||projVers2;
     97  say 'Fixpack='||Fixpack;
     98end
    9299
    93 SET "BUILDLEVEL=@#"ProjVendor":"versionIn"#@##1## "ProjString":"alsalevel":::"ProjVersion"::"Fixpack"@@"productname
    94 
    95 call RxFuncAdd 'SysLoadFuncs', 'RexxUtil', 'SysLoadFuncs'
    96 call SysLoadFuncs
    97 dummy = SysFileDelete(versMak)
     100dummy = SysFileDelete(versMak);
    98101
    99102if (stream(versMak, 'c', 'open write' ) = 'READY:') then
    100103do
    101104    call lineout versMak, '#'
    102 /*    call lineout versMak, '#       VERSION.MAK'
     105    call lineout versMak, '#       VERSION.MAK'
    103106    call lineout versMak, '#'
    104107    call lineout versMak, '#       Current build level for File Versioning'
    … …  
    106109    call lineout versMak, '#       Generated by mkversion.cmd, do NOT edit !'
    107110    call lineout versMak, '#'
    108     call lineout versMak, 'BLDLVL_VENDOR = 'projVendor
    109     call lineout versMak, 'BLDLVL_PRODUCT = 'projProduct
    110     call lineout versMak, 'BLDLVL_REVISION = 'major'.'minor
    111     call lineout versMak, 'BLDLVL_FILEVER = 'projVersion
    112     call lineout versMak, 'BLDLVL_DATETIME = 'projDate' 'projTime
    113     call lineout versMak, 'BLDLVL_MACHINE = 'projHost
     111    call lineout versMak, 'BLDLVL_VENDOR = '||projVendor;
     112    call lineout versMak, 'BLDLVL_VERSION = '||versionIn;
     113    call lineout versMak, 'BLDLVL_FIXPACK = '||Fixpack;
     114    call lineout versMak, 'BLDLVL_ALSA = '||alsalevel;
    114115    call stream versMak, 'c', 'close';
    115 */
    116116end
    117117else
    … …  
    121121end
    122122
    123 
    124123dummy = SysFileDelete(versHdr)
    125124
    126125if (stream(versHdr, 'c', 'open write' ) = 'READY:') then
    127126do
    128     call lineout versHdr, '/*'
    129     call lineout versHdr, ' * version.h   Header for version string'
    130     call lineout versHdr, ' *'
    131     call lineout versHdr, ' *    Generated by mkversion.cmd, do NOT edit !'
    132     call lineout versHdr, ' *'
    133     call lineout versHdr, ' */'
     127    call lineout versHdr, '/*';
     128    call lineout versHdr, ' * version.h   Header for version string';
     129    call lineout versHdr, ' *';
     130    call lineout versHdr, ' *    Generated by mkversion.cmd, do NOT edit !';
     131    call lineout versHdr, ' *';
     132    call lineout versHdr, ' */';
     133    call lineout versHdr, ' ';
     134    call lineout versHdr, ' ';
     135    call lineout versHdr, '#ifndef __UNIAUDVERSION_H__';
     136    call lineout versHdr, '#define __UNIAUDVERSION_H__';
     137    call lineout versHdr, ' ';
     138    call lineout versHdr, ' ';
     139    call lineout versHdr, '#define PRODUCT_NAME            "'||ProductName||'"';
     140    call lineout versHdr, '#define VENDOR_NAME             "'||projVendor||'"';
     141    call lineout versHdr, '#define PRODUCT_TIMESTAMP       '||projDate2||'       // YYYYMMDD';
     142    call lineout versHdr, '#define UNIAUD_VERSION          "'||projVers||'"';
     143    call lineout versHdr, '#define ALSA_VERSION            "'||alsalevel||'"';
    134144    call lineout versHdr, ' '
    135145    call lineout versHdr, ' '
    136     call lineout versHdr, '#ifndef __UNIAUDVERSION_H__'
    137     call lineout versHdr, '#define __UNIAUDVERSION_H__'
    138     call lineout versHdr, ' '
    139     call lineout versHdr, ' '
    140     call lineout versHdr, '#define PRODUCT_NAME            "'ProductName'"'
    141     call lineout versHdr, '#define VENDOR_NAME             "'projVendor'"'
    142     call lineout versHdr, '#define PRODUCT_TIMESTAMP       'projDate2'       // YYYYMMDD'
    143     call lineout versHdr, '#define UNIAUD_VERSION          "'projVers'"'
    144     call lineout versHdr, '#define ALSA_VERSION            "'alsalevel'"'
    145     call lineout versHdr, ' '
    146     call lineout versHdr, ' '
    147     call lineout versHdr, '#define RM_VERSION              'projVers2
    148     call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"'
    149     call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'projProduct'"'
    150     call lineout versHdr, '#define RM_ADAPTER_NAME         "'projAdapter'"'
    151     call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'projVendorNam'"'
    152     call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)'
    153     call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)'
    154     call lineout versHdr, '#define RM_DRIVER_BUILDDAY      (PRODUCT_TIMESTAMP % 100)'
    155     call lineout versHdr, ' '
    156     call lineout versHdr, ' '
    157     call lineout versHdr, "#endif //__UNIAUDVERSION_H__"
    158     call lineout versHdr, ' '
     146    call lineout versHdr, '#define RM_VERSION              '||projVers2;
     147    call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"';
     148    call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'||projProduct||'"';
     149    call lineout versHdr, '#define RM_ADAPTER_NAME         "'||projAdapter||'"';
     150    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendorNam||'"';
     151    call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)';
     152    call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)';
     153    call lineout versHdr, '#define RM_DRIVER_BUILDDAY      (PRODUCT_TIMESTAMP % 100)';
     154    call lineout versHdr, ' ';
     155    call lineout versHdr, ' ';
     156    call lineout versHdr, "#endif //__UNIAUDVERSION_H__";
     157    call lineout versHdr, ' ';
    159158    call stream versHdr, 'c', 'close';
    160159end
    … …  
    167166exit 0;
    168167
     168/**
     169 * Procedure section
     170 **/
    169171
     172EnvVar_Get: procedure
     173    parse arg sEnvVar
     174    if translate(sEnvVar) == 'BEGINLIBPATH' then
     175      s = SysQueryExtLibpath('B')
     176    else if translate(sEnvVar) == 'ENDLIBPATH' then
     177      s = SysQueryExtLibpath('E')
     178    else
     179      s = value(sEnvVar,, 'OS2ENVIRONMENT')
     180    return s;
    170181
     182/*
     183 * Returns value of sEnvVar from environment if set or returns default value.
     184 */
     185EnvVar_Get_If: procedure
     186  parse arg sEnvVar, sDefault;
     187  s = EnvVar_Get(sEnvVar);
     188  if s == '' then
     189    s = sDefault;
     190  return s;
     191
Note: See TracChangeset for help on using the changeset viewer.