Changeset 2457

Timestamp:

Nov 17, 2005, 3:50:27 AM (20 years ago)

Author:

bird

Message:

it's OFFICIAL_BIRD_VERSION not _BUILD! Rebuilding ga as ga2.

Location:

branches/libc-0.6

Files:

• Makefile (modified) (3 diffs)
• src/emx/Makefile.gmk (modified) (1 diff)
• src/emx/version.smak (modified) (2 diffs)

branches/libc-0.6/Makefile

@@ -60 +60 @@
 export GCC_VERSION              ?= 3.3.5
 export GCC_VERSION_SHORT        ?= 335
-ifdef OFFICIAL_BIRD_BUILD
-export GCC_RELEASE_ID           ?= ga
+ifdef OFFICIAL_BIRD_VERSION
+export GCC_RELEASE_ID           ?= ga2
 else
 export GCC_RELEASE_ID           ?= x
@@ -84 +84 @@
 export BUILD_TS
 endif
-export INNOTEK_VERSION                  ?= (Innotek Build $(BUILD_TS))
+ifdef OFFICIAL_BIRD_VERSION
+export INNOTEK_VERSION                  ?= (Bird Build $(BUILD_TS))
+else
+export INNOTEK_VERSION                  ?= (Non-Bird Build $(BUILD_TS))
+endif
 
                         
@@ -1504 +1508 @@
         cvs -q update -d -P 2>&1 | tee up.log
 
-ifdef OFFICIAL_BIRD_BUILD
+ifdef OFFICIAL_BIRD_VERSION
 ifneq ($(HOSTNAME),eniac)
 $(error yea, nice try! Now go be ashamed of yourself!)

branches/libc-0.6/src/emx/Makefile.gmk

@@ -303 +303 @@
 -include $(SUBMAK)
 
-ifdef OFFICIAL_BIRD_BUILD
+ifdef OFFICIAL_BIRD_VERSION
 ifneq ($(HOSTNAME),eniac)
 $(error yea, nice try! Now go be ashamed of yourself!)

branches/libc-0.6/src/emx/version.smak

@@ -4 +4 @@
 VH = 0
 # Middle part of version number
-ifdef OFFICIAL_BIRD_BUILD
+ifdef OFFICIAL_BIRD_VERSION
 VM = 6
 else
@@ -23 +23 @@
 # INNOTEK_VERSION is normally defined in the environment by a toplevel makefile.
 ifndef INNOTEK_VERSION
-ifdef OFFICIAL_BIRD_BUILD
-export INNOTEK_VERSION        ?= (InnoTek Build $(shell date '+%Y-%m-%d %H:%M'))
+ifdef OFFICIAL_BIRD_VERSION
+export INNOTEK_VERSION        ?= (Bird Build $(shell date '+%Y-%m-%d %H:%M'))
 else
-export INNOTEK_VERSION        ?= (Non-InnoTek Build $(shell date '+%Y-%m-%d %H:%M'))
+export INNOTEK_VERSION        ?= (Non-Bird Build $(shell date '+%Y-%m-%d %H:%M'))
 endif
 endif