Changeset 182 for trunk/include

Timestamp:

Nov 7, 2017, 7:12:46 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Get Vendor and BuildMachine from the environment [v1.1.1-testing]

If 'BLDLVL_VENDOR' and BLDLVL_MCHINE' are not in the environment,
their values will be set to '*UNKNOWN*'. Currently these *must* be
environment variables, passing them on the (w)make cli might not work.
Also, no spaces are allowed in the values.

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

Location:

trunk/include

Files:

• makefile.mif (modified) (1 diff)
• version.h (modified) (2 diffs)

trunk/include/makefile.mif

@@ -105 +105 @@
 #
 %ZVAR=This variable will be placed in the Environment
+
+#
+# Set the '*UNKNOWN*' value for Vendor and BuildMachine if undefined or empty
+#
+!if     "$(%BLDLVL_VENDOR)"==""
+%BLDLVL_VENDOR=*UNKNOWN*
+!endif
+!if     "$(%BLDLVL_MACHINE)"==""
+%BLDLVL_MACHINE=*UNKNOWN*
+!endif
+
+#
+# Compose JWasm defines to pass on command-line
+#
+%JWASM_DEFINES=
+%JWASM_DEFINES += -DBLDLVL_VENDOR="'$(%BLDLVL_VENDOR)'"
+%JWASM_DEFINES += -DBLDLVL_MACHINE="'$(%BLDLVL_MACHINE)'"
+
+#
+# Compose C-Compiler defines to pass on command-line
+#
+%CC_DEFINES=
+!ifdef  __LINUX__
+%CC_DEFINES += -dBLDLVL_VENDOR='"$(%BLDLVL_VENDOR)"'
+%CC_DEFINES += -dBLDLVL_MACHINE='"$(%BLDLVL_MACHINE)"'
+!else
+%CC_DEFINES += -dBLDLVL_VENDOR="$(%BLDLVL_VENDOR)"
+%CC_DEFINES += -dBLDLVL_MACHINE="$(%BLDLVL_MACHINE)"
+!endif
 
 #

trunk/include/version.h

@@ -21 +21 @@
 // OS/2 BLDLEVEL Information.
 */
+
 // Vendor
-//~ #define     BLDLVL_VENDOR           "KIEWITZ"
-//~ #define     BLDLVL_VENDOR           "RDPe"
+#ifndef     BLDLVL_VENDOR
 #define     BLDLVL_VENDOR           "*UNKNOWN*"
+#endif
+
+// Build machine
+#ifndef     BLDLVL_MACHINE
+#define     BLDLVL_MACHINE          "*UNKNOWN*"
+#endif
+
 // Version
 #define     BLDLVL_MAJOR_VERSION    "1"
 #define     BLDLVL_MIDDLE_VERSION   "1"
 #define     BLDLVL_MINOR_VERSION    "1"
+
 // Build date
 #define     BLDLVL_YEAR             "2017"
 #define     BLDLVL_MONTH            "04"
 #define     BLDLVL_DAY              "13"
+
 // Build time
 //~ #define     BLDLVL_HOURS            "01"
@@ -40 +49 @@
 #define     BLDLVL_MINUTES          "59"
 #define     BLDLVL_SECONDS          "59"
-// Build machine
-//~ #define     BLDLVL_MACHINE          "OS2BLDBOX"
-#define     BLDLVL_MACHINE          "*UNKNOWN*"
+
 // Build language
 #define     BLDLVL_LANGUAGE         "EN"
-