Changeset 63 for trunk/install/c


Ignore:
Timestamp:
Oct 9, 2016, 10:53:41 PM (9 years ago)
Author:
Ben Rietbroek
Message:

Updated Build Info and added File Commander Build Menus [v1.1.1-testing]

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Changes:
o Updated Build Info
o Added simple File Commander Build Menus
o Removed tabs from non-recipe sections in Makefiles

Notes:
o RU version currently does not build due to lack of code-space

Will be resolved when FX-code is removed from build.

Location:
trunk/install/c
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/install/c/GNUmakefile

    r60 r63  
    66# Include the forwarder.
    77#
    8 include         ../../include/makefrwd.mif
     8include ../../include/makefrwd.mif

  • trunk/install/c/Makefile

    r60 r63  
    11###############################################################################
    2 # Makefile :: Builds the Installer for several platforms.             [wmake] #
    3 ###############################################################################
    4 # rousseau@ecomstation.com
    5 
    6 #
    7 # This Makefile builds the Installer for DOS, Windows, OS/2 and Linux.
    8 # Like 'fixcode', each platform version has a letter appended it:
    9 # 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.
    10 #
     2# Makefile :: Builds the Installer for several platforms              [WMake] #
     3# --------------------------------------------------------------------------- #
     4#                                                                             #
     5# This Makefile builds the Installer for DOS, Windows, OS/2 and Linux.        #
     6# Like 'fixcode', each platform version has a letter appended it:             #
     7# 'D' for DOS, 'W' for Windows, '2' for OS/2 and 'L' for Linux.               #
     8#                                                                             #
     9###############################################################################
     10
    1111
    1212#
    … …  
    1414# This is used to compensate for the differences between the target platforms.
    1515#
    16 !include        ../../include/makefile.mif
     16!include ../../include/makefile.mif
    1717
    1818
    … …  
    7777# we are building on Linux.
    7878#
    79 !ifdef  __LINUX__
     79!ifdef __LINUX__
    8080!if "$(ASM)"=="masm" | "$(ASM)"=="tasm" | "$(ASM)"=="alp"
    8181ASM=jwasm
    … …  
    8484
    8585!if "$(ASM)"=="jwasm"
    86 # -Cp   = case sensitive symbols
    87 # -zcw  = no _ prefix on symbols (C model)
     86# -Cp   = case sensitive symbols
     87# -zcw = no _ prefix on symbols (C model)
    8888ASM_FLAGS_D0=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Cp -Fo$^. -Fl=$^&.lst -Fw$^&.err
    8989ASM_FLAGS_D1=-DDEBUG_LEVEL=$(DEBUG_LEVEL) -DASSEMBLER=JWASM -q -Zd -Zi -Fo$^. -Sa -Fl=$^&.lst -Fw$^&.err
    … …  
    140140LNK_FLAGS_D0=op q op v op map=$^&.map
    141141#~ LNK_FLAGS_D1=op q op v d all &
    142         #~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
    143         #~ op map=$^&.MAP
     142#~ order clname CODE clname FAR_CONST clname FAR_DATA clnam BEGDATA clname DATA clname BSS clname STACK clname BLAP NOE &
     143#~ op map=$^&.MAP
    144144LNK_FLAGS_D1=op q op v d all op map=$^&.map
    145145LNK_FLAGS_D2=op q op v d all op map=$^&.map
    … …  
    158158.AFTER
    159159#       @echo == AFTER ==
    160 !ifdef  __MSDOS__
     160!ifdef __MSDOS__
    161161        @echo $(WARN_DOS_BLD_ENV)
    162162!endif
    … …  
    167167# If this Makefile was modified, all targets are forcefully rebuilt.
    168168#
    169 all:    .SYMBOLIC Makefile.bu header $(TARGETS) footer
     169all: .SYMBOLIC Makefile.bu header $(TARGETS) footer
    170170
    171171
    … …  
    189189# Show the header.
    190190#
    191 header: .SYMBOLIC
     191header: .SYMBOLIC
    192192        @echo.
    193193        @echo =====================================================================
    … …  
    200200# Show the footer.
    201201#
    202 footer: .SYMBOLIC
     202footer: .SYMBOLIC
    203203        @echo All targets up to date !
    204204        @echo.
    … …  
    211211# using the new level.
    212212#
    213 Makefile.bu:    Makefile
     213Makefile.bu: Makefile
    214214        @echo.
    215215        @echo Makefile modified, forcing rebuild of all targets !
    … …  
    255255# DOS 16-bits (MZ)
    256256###############################################################################
    257 $(MODULE)d.exe: $(MODULE)d.obj
     257$(MODULE)d.exe: $(MODULE)d.obj
    258258#       @cat $^&.MD5
    259259        $(LNK) $(LNK_FLAGS) op stack=8192 file $^&.obj name $^. sys dos
    … …  
    261261#       @cat $^&.md5
    262262        @wdump $^. > $^&.wdu
    263         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     263        @if exist $^. @echo $^. $(MSG_SUCCESS)
    264264        @echo.
    265265        #~ wstrip $^.
    266266
    267 $(MODULE)d.obj: $(BASENAME).c $(BASENAME).h
     267$(MODULE)d.obj: $(BASENAME).c $(BASENAME).h
    268268#       @echo.
    269         @echo TARGET: $^&.exe   [DOS 16-bits Executable]
     269        @echo TARGET: $^&.exe [DOS 16-bits Executable]
    270270        $(CC16) $(CC16_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os21x -bt=dos $(BASENAME).c
    271271        @wdis -fi $^. > $^&.wda
    … …  
    275275# NT 32-bits (PE)
    276276###############################################################################
    277 $(MODULE)w.exe: $(MODULE)w.obj
     277$(MODULE)w.exe: $(MODULE)w.obj
    278278        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys nt
    279279        @wdump $^. > $^&.wdu
    280         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    281         @echo.
    282 
    283 $(MODULE)w.obj: $(BASENAME).c $(BASENAME).h
     280        @if exist $^. @echo $^. $(MSG_SUCCESS)
     281        @echo.
     282
     283$(MODULE)w.obj: $(BASENAME).c $(BASENAME).h
    284284#       @echo.
    285         @echo TARGET: $^&.exe   [NT 32-bits Executable]
     285        @echo TARGET: $^&.exe [NT 32-bits Executable]
    286286        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)nt -bt=nt $(BASENAME).c
    287287        @wdis -fi $^. > $^&.wda
    … …  
    291291# OS/2 32-bits (LX)
    292292###############################################################################
    293 $(MODULE)2.exe: $(MODULE)2.obj
     293$(MODULE)2.exe: $(MODULE)2.obj
    294294        $(LNK) $(LNK_FLAGS) file $^&.obj name $^. sys os2v2
    295295        @wdump $^. > $^&.wdu
    296         @if exist $^. @echo             $^. $(MSG_SUCCESS)
     296        @if exist $^. @echo $^. $(MSG_SUCCESS)
    297297        @echo.
    298298        #~ wstrip $^.
    299299
    300 $(MODULE)2.obj: $(BASENAME).c $(BASENAME).h
     300$(MODULE)2.obj: $(BASENAME).c $(BASENAME).h
    301301#       @echo.
    302         @echo TARGET: $^&.exe   [OS/2 32-bits Executable]
     302        @echo TARGET: $^&.exe [OS/2 32-bits Executable]
    303303        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=os2 $(BASENAME).c
    304304        @wdis -fi $^. > $^&.wda
    … …  
    308308# Linux 32-bits (ELF)
    309309###############################################################################
    310 $(MODULE)l.elf: $(MODULE)l.obj
     310$(MODULE)l.elf: $(MODULE)l.obj
    311311        $(LNK) $(LNK_FLAGS) file $^&.obj name $^&.elf sys linux
    312312        @wdump $^. > $^&.wdu
    313313#       $(MV) $^&.elf $^.
    314         @if exist $^. @echo             $^. $(MSG_SUCCESS)
    315         @echo.
    316 
    317 $(MODULE)l.obj: $(BASENAME).c $(BASENAME).h
     314        @if exist $^. @echo $^. $(MSG_SUCCESS)
     315        @echo.
     316
     317$(MODULE)l.obj: $(BASENAME).c $(BASENAME).h
    318318#       @echo.
    319         @echo TARGET: $^&.elf   [Linux 32-bits Executable]
     319        @echo TARGET: $^&.elf [Linux 32-bits Executable]
    320320        $(CC32) $(CC32_FLAGS) -I$(%WATCOM)$(DS)h$(DS)os2 -bt=linux $(BASENAME).c
    321321        @wdis -fi $^. > $^&.wda
    … …  
    337337# Then it installs the English version to 'releases' as 'airboot.bin'.
    338338# -----------------------------------------------------------------------------
    339 dist:   .SYMBOLIC
     339dist: .SYMBOLIC
    340340        @if exist airboot2.exe $(CP) airboot2.exe ..$(DS)..$(DS)release$(DS)os2
    341341        @if exist airbootd.exe $(CP) airbootd.exe ..$(DS)..$(DS)release$(DS)dos
    … …  
    346346# Rebuild all targets.
    347347#
    348 rebuild:        .SYMBOLIC
     348rebuild: .SYMBOLIC
    349349        @%MAKE clean
    350350        @%MAKE all
    … …  
    353353# Remove all generated files.
    354354#
    355 clean:  .SYMBOLIC
     355clean: .SYMBOLIC
    356356        @for %%i in ($(TARGETS)) do @if exist %%i $(RM) %%i
    357357        @if exist *.obj $(RM) *.obj
    … …  
    367367# Help on using this Makefile.
    368368#
    369 help:   .SYMBOLIC
    370         @echo.
    371         @echo           The following actions are available:
    372         @echo           wmake           to build all targets
    373         @echo           wmake show      to show the list of buildable targets
    374         @echo           wmake clean     to remove all generated files
    375         @echo           wmake rebuild   to rebuild all targets
    376         @echo           wmake help      for this information
     369help: .SYMBOLIC
     370        @echo.
     371        @echo The following actions are available:
     372        @echo wmake         to build all targets
     373        @echo wmake show    to show the list of buildable targets
     374        @echo wmake clean   to remove all generated files
     375        @echo wmake rebuild to rebuild all targets
     376        @echo wmake help    to show this information
    377377        @echo.
    378378
    … …  
    380380# Show the list of buildable targets.
    381381#
    382 show:   .SYMBOLIC
    383         @echo.
    384         @echo           The following [case sensitive] targets can be built:
    385         @for %%i in ($(TARGETS)) do @echo       %%i
     382show: .SYMBOLIC
     383        @echo.
     384        @echo The following [case sensitive] targets can be built:
     385        @for %%i in ($(TARGETS)) do @echo %%i
    386386        @echo.
    387387# Alias for show
    388 list:   .SYMBOLIC
     388list: .SYMBOLIC
    389389        @%MAKE show
    390390
    … …  
    394394.ERROR
    395395        @echo.
    396         @echo           Oops!
    397         @echo           Some error occured in this build session.
    398         @echo           If it's a linker problem, it could be
    399         @echo           the result of out-of-sync object files.
    400         @echo           Doing a wmake rebuild might resolve the problem.
     396        @echo Oops!
     397        @echo Some error occured in this build session.
     398        @echo If it's a linker problem, it could be
     399        @echo the result of out-of-sync object files.
     400        @echo Doing a wmake rebuild might resolve the problem.
    401401        @%MAKE help
    402402        @echo.
    403 
    404 

  • trunk/install/c/install.h

    r60 r63  
    2222*/
    2323// Vendor
    24 #define     BLDLVL_VENDOR           "KIEWITZ"
     24//~ #define     BLDLVL_VENDOR           "KIEWITZ"
     25//~ #define     BLDLVL_VENDOR           "RDPe"
     26#define     BLDLVL_VENDOR           "*UNKNOWN*"
    2527// Version
    2628#define     BLDLVL_MAJOR_VERSION    "1"
    2729#define     BLDLVL_MIDDLE_VERSION   "1"
    28 #define     BLDLVL_MINOR_VERSION    "0"
     30#define     BLDLVL_MINOR_VERSION    "1"
    2931// Build date
    30 #define     BLDLVL_YEAR             "2013"
    31 #define     BLDLVL_MONTH            "04"
    32 #define     BLDLVL_DAY              "05"
     32#define     BLDLVL_YEAR             "2016"
     33#define     BLDLVL_MONTH            "10"
     34#define     BLDLVL_DAY              "09"
    3335// Build time
    34 #define     BLDLVL_HOURS            "01"
    35 #define     BLDLVL_MINUTES          "01"
    36 #define     BLDLVL_SECONDS          "00"
     36//~ #define     BLDLVL_HOURS            "01"
     37//~ #define     BLDLVL_MINUTES          "01"
     38//~ #define     BLDLVL_SECONDS          "00"
     39#define     BLDLVL_HOURS            "99"
     40#define     BLDLVL_MINUTES          "99"
     41#define     BLDLVL_SECONDS          "99"
    3742// Build machine
     43//~ #define     BLDLVL_MACHINE          "OS2BLDBOX"
    3844#define     BLDLVL_MACHINE          "*UNKNOWN*"
    3945// Build language
    … …  
    122128#define     CONFIG_OFFSET           0x6C00                              // Byte offset of config-sector
    123129#define     SECTORS_BEFORE_CONFIG   CONFIG_OFFSET / BYTES_PER_SECTOR    // Nr of sectors before config-sector
    124 
    125 
    126 
    127 
Note: See TracChangeset for help on using the changeset viewer.