Changeset 60 for trunk/install


Ignore:
Timestamp:
Feb 18, 2016, 5:18:51 PM (10 years ago)
Author:
Ben Rietbroek
Message:

Fixed building on Linux [v1.1.1-testing]

Of course the lowercasing broke building on Linux.
This commit fixes that.

Location:
trunk/install
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/install/c/GNUmakefile

    r46 r60  
    66# Include the forwarder.
    77#
    8 include         ../../INCLUDE/MAKEFRWD.MIF
     8include         ../../include/makefrwd.mif

  • trunk/install/c/Makefile

    r55 r60  
    33###############################################################################
    44# rousseau@ecomstation.com
    5 #
    6 # Derived from the FIXCODE Makefile.
    7 #
    85
    96#
    107# This Makefile builds the Installer for DOS, Windows, OS/2 and Linux.
    11 # Like FIXCODE, each platform version has a letter appended it:
     8# Like 'fixcode', each platform version has a letter appended it:
    129# 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.
    1310#
    … …  
    1714# This is used to compensate for the differences between the target platforms.
    1815#
    19 !include        ../../INCLUDE/MAKEFILE.MIF
     16!include        ../../include/makefile.mif
    2017
    2118
    … …  
    5249# Base Name of Source Program to compile.
    5350#
    54 BASENAME=INSTALL
     51BASENAME=install
    5552
    5653#
    … …  
    5956# D=DOS, W=Windows, 2=OS2, L=Linux.
    6057#
    61 MODULE=AIRBOOT
     58MODULE=airboot
    6259
    6360#
    6461# This is a list of the Targets to be built.
    6562#
    66 TARGETS=$(MODULE)D.EXE $(MODULE)W.EXE $(MODULE)2.EXE $(MODULE)L.ELF
     63TARGETS=$(MODULE)d.exe $(MODULE)w.exe $(MODULE)2.exe $(MODULE)l.elf
    6764
    6865
    … …  
    8986# -Cp   = case sensitive symbols
    9087# -zcw  = no _ prefix on symbols (C model)
    91 ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.LST -Fw$^&.ERR
    92 ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
    93 ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.LST -Fw$^&.ERR
     88ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
     89ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
     90ASM_FLAGS_D2=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    9491!elseif "$(ASM)"=="wasm"
    95 ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.ERR
    96 ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
    97 ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.ERR
     92ASM_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -fo=$^. -fr=$^&.err
     93ASM_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
     94ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -zq -d1 -fo=$^. -fr=$^&.err
    9895!elseif "$(ASM)"=="tasm"
    9996# -ml   = case sensitive symbols
    … …  
    10299ASM_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) -dASSEMBLER=TASM -t -z -zi -c -la
    103100!elseif "$(ASM)"=="alp"
    104 ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
    105 ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
    106 ASM_FLAGS_D2=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:OBJ +Fl +Fel:LST +Fm +Fem:ERR
     101ASM_FLAGS_D0=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Feo:obj +Fl +Fel:lst +Fm +Fem:err
     102ASM_FLAGS_D1=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:obj +Fl +Fel:lst +Fm +Fem:err
     103ASM_FLAGS_D2=-D:DEBUG_LEVEL=$(DEBUG_LEVEL) -D:ASSEMBLER=ALP -Mb +Od:MS16 +Feo:obj +Fl +Fel:lst +Fm +Fem:err
    107104!else
    108105!error Unknown Assembler specified !
    … …  
    116113CPU=-2
    117114CC16=wcc
    118 CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -w4 -e25 -zq -osexan -fo=$^. -fr=$^&.ERR
    119 CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -d2 -w4 -e25 -zq -on -fo=$^. -fr=$^&.ERR
    120 CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -d3 -w4 -e25 -zq -od -fo=$^. -fr=$^&.ERR
     115CC16_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -w4 -e25 -zq -osexan -fo=$^. -fr=$^&.err
     116CC16_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -d2 -w4 -e25 -zq -on -fo=$^. -fr=$^&.err
     117CC16_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(CPU) $(MM16) -d3 -w4 -e25 -zq -od -fo=$^. -fr=$^&.err
    121118CC16_FLAGS=$(CC16_FLAGS_D$(DEBUG_LEVEL))
    122119
    … …  
    126123MM32=-mf
    127124CC32=wcc386
    128 CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -osexan -6r -fo=$^. -fr=$^&.ERR
    129 CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -on -6r -fo=$^. -fr=$^&.ERR
    130 CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d3 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.ERR
     125CC32_FLAGS_D0=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -w4 -e25 -zq -osexan -6r -fo=$^. -fr=$^&.err
     126CC32_FLAGS_D1=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d2 -w4 -e25 -zq -on -6r -fo=$^. -fr=$^&.err
     127CC32_FLAGS_D2=-dDEBUG_LEVEL=$(DEBUG_LEVEL) $(MM32) -d3 -w4 -e25 -zq -od -6r -fo=$^. -fr=$^&.err
    131128CC32_FLAGS=$(CC32_FLAGS_D$(DEBUG_LEVEL))
    132129
    … …  
    141138#
    142139#~ LNK_FLAGS_D0=op q op v op map=$^&.MAP op de '\x40\x23KIEWITZ:1.18\x23\x40\x41iR-BOOT Installer by Kiewitz'
    143 LNK_FLAGS_D0=op q op v op map=$^&.MAP
     140LNK_FLAGS_D0=op q op v op map=$^&.map
    144141#~ LNK_FLAGS_D1=op q op v d all &
    145142        #~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
    146143        #~ op map=$^&.MAP
    147 LNK_FLAGS_D1=op q op v d all op map=$^&.MAP
    148 LNK_FLAGS_D2=op q op v d all op map=$^&.MAP
     144LNK_FLAGS_D1=op q op v d all op map=$^&.map
     145LNK_FLAGS_D2=op q op v d all op map=$^&.map
    149146LNK_FLAGS=$(LNK_FLAGS_D$(DEBUG_LEVEL))
    150147
    … …  
    195192        @echo.
    196193        @echo =====================================================================
    197         @echo = PROGRAM: INSTALL Multi Platform      [DOS, Win32, OS/2 and Linux] =
     194        @echo = PROGRAM: 'install' Multi Platform    [DOS, Win32, OS/2 and Linux] =
    198195        @echo =====================================================================
    199196#       @echo.
    … …  
    258255# DOS 16-bits (MZ)
    259256###############################################################################
    260 $(MODULE)D.EXE: $(MODULE)D.OBJ
     257$(MODULE)d.exe: $(MODULE)d.obj
    261258#       @cat $^&.MD5
    262         $(LNK) $(LNK_FLAGS) op stack=8192 file $^&.OBJ name $^. sys dos
    263 #       @md5sum $^. > $^&.MD5
    264 #       @cat $^&.MD5
    265         @wdump $^. > $^&.WDU
     259        $(LNK) $(LNK_FLAGS) op stack=8192 file $^&.obj name $^. sys dos
     260#       @md5sum $^. > $^&.md5
     261#       @cat $^&.md5
     262        @wdump $^. > $^&.wdu
    266263        @if exist $^. @echo             $^. $(MSG_SUCCESS)
    267264        @echo.
    268265        #~ wstrip $^.
    269266
    270 $(MODULE)D.OBJ: $(BASENAME).C $(BASENAME).H
     267$(MODULE)d.obj: $(BASENAME).c $(BASENAME).h
    271268#       @echo.
    272         @echo TARGET: $^&.EXE   [DOS 16-bits Executable]
    273         $(CC16) $(CC16_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os21x -bt=dos $(BASENAME).C
    274         @wdis -fi $^. > $^&.WDA
     269        @echo TARGET: $^&.exe   [DOS 16-bits Executable]
     270        $(CC16) $(CC16_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os21x -bt=dos $(BASENAME).c
     271        @wdis -fi $^. > $^&.wda
    275272
    276273
    … …  
    278275# NT 32-bits (PE)
    279276###############################################################################
    280 $(MODULE)W.EXE: $(MODULE)W.OBJ
    281         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys nt
    282         @wdump $^. > $^&.WDU
     277$(MODULE)w.exe: $(MODULE)w.obj
     278        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys nt
     279        @wdump $^. > $^&.wdu
    283280        @if exist $^. @echo             $^. $(MSG_SUCCESS)
    284281        @echo.
    285282
    286 $(MODULE)W.OBJ: $(BASENAME).C $(BASENAME).H
     283$(MODULE)w.obj: $(BASENAME).c $(BASENAME).h
    287284#       @echo.
    288         @echo TARGET: $^&.EXE   [NT 32-bits Executable]
    289         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).C
    290         @wdis -fi $^. > $^&.WDA
     285        @echo TARGET: $^&.exe   [NT 32-bits Executable]
     286        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).c
     287        @wdis -fi $^. > $^&.wda
    291288
    292289
    … …  
    294291# OS/2 32-bits (LX)
    295292###############################################################################
    296 $(MODULE)2.EXE: $(MODULE)2.OBJ
    297         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^. sys os2v2
    298         @wdump $^. > $^&.WDU
     293$(MODULE)2.exe: $(MODULE)2.obj
     294        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
     295        @wdump $^. > $^&.wdu
    299296        @if exist $^. @echo             $^. $(MSG_SUCCESS)
    300297        @echo.
    301298        #~ wstrip $^.
    302299
    303 $(MODULE)2.OBJ: $(BASENAME).C $(BASENAME).H
     300$(MODULE)2.obj: $(BASENAME).c $(BASENAME).h
    304301#       @echo.
    305         @echo TARGET: $^&.EXE   [OS/2 32-bits Executable]
    306         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).C
    307         @wdis -fi $^. > $^&.WDA
     302        @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     303        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
     304        @wdis -fi $^. > $^&.wda
    308305
    309306
    … …  
    311308# Linux 32-bits (ELF)
    312309###############################################################################
    313 $(MODULE)L.ELF: $(MODULE)L.OBJ
    314         $(LNK) $(LNK_FLAGS) file $^&.OBJ name $^&.ELF sys linux
    315         @wdump $^. > $^&.WDU
    316 #       $(MV) $^&.ELF $^.
     310$(MODULE)l.elf: $(MODULE)l.obj
     311        $(LNK) $(LNK_FLAGS) file $^&.obj name $^&.elf sys linux
     312        @wdump $^. > $^&.wdu
     313#       $(MV) $^&.elf $^.
    317314        @if exist $^. @echo             $^. $(MSG_SUCCESS)
    318315        @echo.
    319316
    320 $(MODULE)L.OBJ: $(BASENAME).C $(BASENAME).H
     317$(MODULE)l.obj: $(BASENAME).c $(BASENAME).h
    321318#       @echo.
    322         @echo TARGET: $^&.ELF   [Linux 32-bits Executable]
    323         $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=linux $(BASENAME).C
    324         @wdis -fi $^. > $^&.WDA
     319        @echo TARGET: $^&.elf   [Linux 32-bits Executable]
     320        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=linux $(BASENAME).c
     321        @wdis -fi $^. > $^&.wda
    325322
    326323
    … …  
    337334# DISTRIBUTE TO RELEASE SPACE
    338335# -----------------------------------------------------------------------------
    339 # This distributes all .BIN files to BOOTCODE.
    340 # Then it installs the English version to RELEASES as AIRBOOT.BIN.
     336# This distributes all '.bin' files to 'bootcode'.
     337# Then it installs the English version to 'releases' as 'airboot.bin'.
    341338# -----------------------------------------------------------------------------
    342339dist:   .SYMBOLIC
    343         @if exist AIRBOOT2.EXE $(CP) AIRBOOT2.EXE ..$(DS)..$(DS)RELEASE$(DS)OS2
    344         @if exist AIRBOOTD.EXE $(CP) AIRBOOTD.EXE ..$(DS)..$(DS)RELEASE$(DS)DOS
    345         @if exist AIRBOOTL.ELF $(CP) AIRBOOTL.ELF ..$(DS)..$(DS)RELEASE$(DS)LINUX
    346         @if exist AIRBOOTW.EXE $(CP) AIRBOOTW.EXE ..$(DS)..$(DS)RELEASE$(DS)WINNT
     340        @if exist airboot2.exe $(CP) airboot2.exe ..$(DS)..$(DS)release$(DS)os2
     341        @if exist airbootd.exe $(CP) airbootd.exe ..$(DS)..$(DS)release$(DS)dos
     342        @if exist airbootl.elf $(CP) airbootl.elf ..$(DS)..$(DS)release$(DS)linux
     343        @if exist airbootw.exe $(CP) airbootw.exe ..$(DS)..$(DS)release$(DS)winnt
    347344
    348345#
    … …  
    358355clean:  .SYMBOLIC
    359356        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    360         @if exist *.OBJ $(RM) *.OBJ
    361         @if exist *.WDA $(RM) *.WDA
    362         @if exist *.WDU $(RM) *.WDU
    363         @if exist *.NDA $(RM) *.NDA
    364         @if exist *.MAP $(RM) *.MAP
    365         @if exist *.LST $(RM) *.LST
    366         @if exist *.ERR $(RM) *.ERR
     357        @if exist *.obj $(RM) *.obj
     358        @if exist *.wda $(RM) *.wda
     359        @if exist *.wdu $(RM) *.wdu
     360        @if exist *.nda $(RM) *.nda
     361        @if exist *.map $(RM) *.map
     362        @if exist *.lst $(RM) *.lst
     363        @if exist *.err $(RM) *.err
    367364        @if exist *.o   $(RM) *.o
    368365

  • trunk/install/c/install.c

    r57 r60  
    1919
    2020
    21 #include    "INSTALL.H"
     21#include    "install.h"
    2222
    2323
    … …  
    15671567
    15681568
    1569     // Allocate buffers for Track0 and AIRBOOT.BIN.
     1569    // Allocate buffers for Track0 and 'airboot.bin'.
    15701570    Track0 = malloc(SECTOR_COUNT * BYTES_PER_SECTOR);
    15711571    Bootcode = malloc(SECTOR_COUNT * BYTES_PER_SECTOR);

  • trunk/install/c/install.h

    r57 r60  
    112112
    113113/* Rousseau: added */
    114 #define     IMAGE_NAME              "AIRBOOT.BIN"
     114#define     IMAGE_NAME              "airboot.bin"
    115115#define     GPT                     0xEE                                // GPT Disk, AiR-BOOT will abort
    116116#define     BYTES_PER_SECTOR        512                                 // This could be higher in the future

  • trunk/install/floppy/kernel.asm

    r57 r60  
    3333StackSeg        equ     7000h
    3434
    35 Include ../../INCLUDE/ASM.INC
     35include ../../include/asm.inc
    3636
    3737                .386p
    … …  
    122122APILockVolume:  retn
    123123
    124                 Include ../INST_X86/INSTALL.INC ; Execute generic code
     124                include ../inst_x86/install.inc ; Execute generic code
    125125COM_EndOfSegment:
    126126
Note: See TracChangeset for help on using the changeset viewer.