Changeset 248

Timestamp:

Dec 3, 2021, 10:27:13 PM (3 years ago)

Author:

Gregg Young

Message:

Update wis build to use the same enviroment variables as the build level string.

File:

• trunk/packaging/warpin/makefile (modified) (1 diff)

trunk/packaging/warpin/makefile ¶

@@ -3 +3 @@
 # $Id: makefile 1679 2013-01-01 21:42:27Z gyoung $
 
-
-!ifndef EFTE2_VER                  # if defined on wmake command, use it
-EFTE2_VER=-1-1-0                   # default value
-!ifdef %EFTE2_VER                  # if defined via env. var.
-EFTE2_VER=$(%EFTE2_VER)            #   use the env. var.
+!ifdef %EFTEMAJOR
+EFTEMAJOR = $(%EFTEMAJOR)
+!else
+EFTEMAJOR = 1
 !endif
+!ifdef %EFTEMINOR
+EFTEMINOR = $(%EFTEMINOR)
+!else
+EFTEMINOR = 1
 !endif
+!ifdef %EFTEREVISION
+EFTEREVISION = $(%EFTEREVISION)
+!else
+EFTEREVISION = 0
+!endif
+!ifdef %EFTEFIXLEVEL
+EFTEFIXLEVEL = $(%EFTEFIXLEVEL)
+!else
+EFTEFIXLEVEL = 0
+!endif
+                 
+EFTE2_VER=-$(EFTEMAJOR)-$(EFTEMINOR)-$(EFTEREVISION)-$(EFTEFIXLEVEL)
 
 all: wpi .symbolic