Changeset 21458 for trunk/tools


Ignore:
Timestamp:
Sep 24, 2010, 5:23:27 PM (15 years ago)
Author:
ydario
Message:

Add new registry keys, make config.sys changes optional, some improved scripting.

Location:
trunk/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/DailyBuild/odin32bldnr.cmd

    r21298 r21458  
    8484    rc = 0;
    8585end
     86else if (sOperation = 'svn') then
     87do
     88
     89    /* get svn revision */
     90    'rxqueue /clear'
     91    'svn info | grep "Revision:" | cut -d" " -f2 | rxqueue'
     92    iBuildNr = LineIn("QUEUE:")
     93
     94    /*
     95     * Scan the odinbuild.h file for ODIN32_BUILD_NR.
     96     */
     97    sOut = 'odinbuild.h';
     98    sIn = 'odinbuild.h.backup';
     99    call SysFileDelete('odinbuild.h.backup');
     100    'copy' sOut sIn;
     101    if (rc) then call failure rc, 'backup copy failed';
     102    call SysFileDelete('odinbuild.h');
     103
     104    rcIn = stream(sIn, 'c', 'open read');
     105    rcOut = stream(sOut, 'c', 'open write');
     106    if (pos('READY', rcIn) <> 1 | pos('READY', rcOut) <> 1) then
     107    do
     108        call stream(sIn, 'c', 'close');
     109        call stream(sOut, 'c', 'close');
     110        call failure 5, 'failed to open in or/and out file. rcIn='rcIn 'rcOut='rcOut;
     111    end
     112
     113    /*
     114     * Copy loop which updates ODIN32_BUILD_NR when found.
     115     */
     116    fFound = 0;
     117    do while (lines(sIn))
     118        sLine = linein(sIn);
     119        if (\fFound & substr(strip(sLine), 1, 24) = '#define ODIN32_BUILD_NR ') then
     120        do
     121            parse var sLine '#define ODIN32_BUILD_NR' iOldBuildNr sComment;
     122            sComment = strip(sComment);
     123            sLine = '#define ODIN32_BUILD_NR       '||iBuildNr||'        '||sComment;
     124            say 'newln:' sLine;
     125            fFound = 1;
     126        end
     127        call lineout sOut, sLine;
     128    end
     129    call lineout sOut, '';
     130    call stream sIn, 'c', 'close';
     131    call stream sOut, 'c', 'close';
     132    rc = 0;
     133end
    86134else if (sOperation = 'commit') then
    87135do

  • trunk/tools/DailyBuild/odin32build.cmd

    r21298 r21458  
    1414    */
    1515
     16/*
     17 * Parse parameters.
     18 */
     19parse arg sSMP
     20
    1621    /* debug build */
    1722    'SET DEBUG=1';
    1823    'nmake dep';
    1924    if (RC <> 0) then call failure rc, 'Make failed (dep).';
    20     'nmake NODEBUGINFO=1';
     25    'nmake NODEBUGINFO=1 'sSMP;
    2126    if (RC <> 0) then call failure rc, 'Make debug failed.';
    2227
    2328    /* release build */
    2429    'SET DEBUG=';
    25     'nmake ';
     30    'nmake 'sSMP;
    2631    if (RC <> 0) then call failure rc, 'Make release failed .';
    2732

  • trunk/tools/install/makefile

    r5425 r21458  
    1616STATIC_CRT = 1
    1717NO_MAIN_BIN_COPY = 1
    18 CLEANEXTRAS = odin32inst.wis *.wpi
     18CLEANEXTRAS = odin32inst.wis *.wpi config.sys
    1919
    2020

  • trunk/tools/install/odin.cmd

    r21443 r21458  
    7878    end
    7979
     80    /* empty (dummy) config.sys for package#5 */
     81    rc = lineout('config.sys', '');
     82    rc = lineout('config.sys');
     83
    8084    rc = PackFiles('odin32inst.wis', asArg.i, MakeArchiveName(asArg.i));
    8185    if (rc <> 0) then
    … …  
    128132
    129133/* create warpin installation script */
    130 rc = lineout(sInstFile, '<WARPIN VERSION="0.9.6" OS="OS2_3x">');
     134rc = lineout(sInstFile, '<WARPIN VERSION="1.0.19" OS="OS2_3x">');
    131135rc = lineout(sInstFile, '<HEAD>');
    132136rc = lineout(sInstFile, '<TITLE>Odin32 'sType' - 'sVer'</TITLE>');
    … …  
    157161rc = lineout(sInstFile, title);
    158162rc = lineout(sInstFile, '     EXECUTE="odininst.exe"');
    159 rc = lineout(sInstFile, '     CONFIGSYS="LIBPATH=$(1)\SYSTEM32 | ADDRIGHT"');
    160 rc = lineout(sInstFile, '     CONFIGSYS="SET PATH=$(1)\SYSTEM32 | ADDRIGHT"');
     163rc = lineout(sInstFile, '     CLEARPROFILE="USER\KLIBC\OdinPath"');
     164rc = lineout(sInstFile, '     WRITEPROFILE="USER\KLIBC\OdinPath|$(2)"');
    161165rc = lineout(sInstFile, '     >Installation of Odin System files .</PCK>');
    162166rc = lineout(sInstFile, '');
    … …  
    185189    rc = lineout(sInstFile, '');
    186190end
     191
     192rc = lineout(sInstFile, '<PCK INDEX=5');
     193rc = lineout(sInstFile, '     PACKAGEID="Odin\Odin\Changes to Config.sys\'sPackVer'"');
     194rc = lineout(sInstFile, '     TARGET="C:\ODIN\SYSTEM32"');
     195rc = lineout(sInstFile, '     FIXED');
     196title = "     TITLE=""Update Config.sys PATH and LIBPATH""";
     197rc = lineout(sInstFile, title);
     198rc = lineout(sInstFile, '     CONFIGSYS="LIBPATH=$(1)\SYSTEM32 | ADDRIGHT"');
     199rc = lineout(sInstFile, '     CONFIGSYS="SET PATH=$(1)\SYSTEM32 | ADDRIGHT"');
     200rc = lineout(sInstFile, '     >Updates PATH and LIBPATH entries in Config.sys.</PCK>');
     201rc = lineout(sInstFile, '');
    187202
    188203rc = lineout(sInstFile, '</HEAD>');
    … …  
    542557    call lineout sWICFile, '4 -c'||sDllDir '*.sym';
    543558
     559
     560/*
     561 * Packet 5 is only for config.sys line but it seems like we have to add something.
     562 */
     563call lineout sWICFile, '5 config.sys';
     564
     565
    544566/*
    545567 * Close input file.
Note: See TracChangeset for help on using the changeset viewer.