Mercurial > hg > Members > kono > nitros9-code

changeset 1803:6b0d1027e4e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed NITROS9VERSION, NITROS9MAJOR, NITROS9MINOR environment vars from use.. bad idea. Now we stick this in rules.mak
author boisy
date Thu, 14 Apr 2005 01:41:06 +0000
parents 124703b3d9ef
children 6e5fa42c2fb1
files level1/cmds/login.asm level1/modules/sysgo.asm rules.mak
diffstat 3 files changed, 34 insertions(+), 48 deletions(-) [+]
line wrap: on
line diff
--- a/level1/cmds/login.asm	Wed Apr 13 20:30:30 2005 +0000
+++ b/level1/cmds/login.asm	Thu Apr 14 01:41:06 2005 +0000
@@ -76,11 +76,11 @@
          ENDC
          ENDC
          fcc   " V0"
-         fcb   48+_$NITROS9VERSION
+         fcb   48+NOS9VER
          fcc   ".0"
-         fcb   48+_$NITROS9MAJOR
+         fcb   48+NOS9MAJ
          fcc   ".0"
-         fcb   48+_$NITROS9MINOR
+         fcb   48+NOS9MIN
          fcb   C$LF
 WideMsgL equ   *-WideMsg
 NrrwMsg  fcb   C$LF,C$LF
--- a/level1/modules/sysgo.asm	Wed Apr 13 20:30:30 2005 +0000
+++ b/level1/modules/sysgo.asm	Thu Apr 14 01:41:06 2005 +0000
@@ -59,11 +59,11 @@
          fcc   /Level /
          fcb   '0+Level
          fcc   / V0/
-         fcb   '0+_$NITROS9VERSION
+         fcb   '0+NOS9VER
          fcc   /.0/
-         fcb   '0+_$NITROS9MAJOR
+         fcb   '0+NOS9MAJ
          fcc   /.0/
-         fcb   '0+_$NITROS9MINOR
+         fcb   '0+NOS9MIN
          fcb   C$CR,C$LF
 * For ROM version, cut down on verbage
          IFEQ  ROM
@@ -71,7 +71,7 @@
          fcb   C$CR,C$LF
          fcc   /(C) 2005 The NitrOS-9 Project/
          fcb   C$CR,C$LF
-         IFNE  _$NITROS9DEVEL
+         IFNE  NOS9DBG
          fcc   "**   DEVELOPMENT BUILD   **"
          fcb   C$CR,C$LF
          fcc   "** NOT FOR DISTRIBUTION! **"
--- a/rules.mak	Wed Apr 13 20:30:30 2005 +0000
+++ b/rules.mak	Thu Apr 14 01:41:06 2005 +0000
@@ -1,35 +1,24 @@
 # The NitrOS-9 Project
 # Project-Wide Rules
 
-# NOTE: THERE IS NO NEED TO MODIFY THIS FILE ANYMORE!
 # Environment variables are now used to specify any directories other
 # than the defaults below:
 #
-#   NITROS9VER   - current version string for NitrOS-9
 #   NITROS9DIR   - base directory of the NitrOS-9 project on your system
-#   COCOTOOLSBIN - directory where CoCoTools binaries are (assembler, etc)
 #
 # If the defaults below are fine, then there is no need to set any
 # environment variables.
 
-#################### DO NOT CHANGE ANYTHING BELOW THIS LINE ####################
 
-# NOTE: All three vars must be set or we set all to zero!
-ifndef	NITROS9VERSION
-NITROS9VERSION	= 0
-NITROS9MAJOR	= 0
-NITROS9MINOR	= 0
-endif
-ifndef	NITROS9MAJOR
-NITROS9VERSION	= 0
-NITROS9MAJOR	= 0
-NITROS9MINOR	= 0
-endif
-ifndef	NITROS9MINOR
-NITROS9VERSION	= 0
-NITROS9MAJOR	= 0
-NITROS9MINOR	= 0
-endif
+# NitrOS-9 version, major and minor release numbers are here
+NOS9VER	= 3
+NOS9MAJ	= 2
+NOS9MIN	= 5
+
+# Set this to 1 to turn on "DEVELOPMENT" message in sysgo
+NOS9DBG = 0
+
+#################### DO NOT CHANGE ANYTHING BELOW THIS LINE ####################
 
 NITROS9VER	= v0$(NITROS9VERSION)0$(NITROS9MAJOR)0$(NITROS9MINOR)
 
@@ -39,9 +28,6 @@
 ifndef	CLOUD9DIR
 CLOUD9DIR	= $(HOME)/cloud9
 endif
-ifndef	COCOTOOLSBIN
-COCOTOOLSBIN	= $(HOME)/bin
-endif
 
 C9		= $(CLOUD9DIR)
 DEFSDIR		= $(NITROS9DIR)/defs
@@ -54,38 +40,38 @@
 #ASOUT		= o=
 
 # Use the cross assembler
-AS		= $(COCOTOOLSBIN)/mamou -i=$(DEFSDIR)
-#AS		= $(COCOTOOLSBIN)/os9asm -i=$(DEFSDIR)
+AS		= mamou -i=$(DEFSDIR)
+#AS		= os9asm -i=$(DEFSDIR)
 ASOUT		= -o
-AFLAGS		= -q
+AFLAGS		= -q -aNOS9VER=$(NOS9VER) -aNOS9MAJ=$(NOS9MAJ) -aNOS9MIN=$(NOS9MIN) -aNOS9DBG=$(NOS9DBG)
 
 # Commands
-MAKDIR		= $(COCOTOOLSBIN)/os9 makdir
+MAKDIR		= os9 makdir
 RM		= rm -f
 MERGE		= cat
 MOVE		= mv
 ECHO		= /bin/echo
 CD		= cd
-CP		= $(COCOTOOLSBIN)/os9 copy -o=0
+CP		= os9 copy -o=0
 CPL		= $(CP) -l
 TAR		= tar
 CHMOD		= chmod
-IDENT		= $(COCOTOOLSBIN)/os9 ident
+IDENT		= os9 ident
 IDENT_SHORT	= $(IDENT) -s
-#UNIX2OS9	= $(COCOTOOLSBIN)/u2o
-#OS92UNIX	= $(COCOTOOLSBIN)/o2u
-OS9FORMAT	= $(COCOTOOLSBIN)/os9 format
-OS9FORMAT_SS35	= $(COCOTOOLSBIN)/os9 format -t35 -ss -dd
-OS9FORMAT_SS40	= $(COCOTOOLSBIN)/os9 format -t40 -ss -dd
-OS9FORMAT_SS80	= $(COCOTOOLSBIN)/os9 format -t80 -ss -dd
-OS9FORMAT_DS40	= $(COCOTOOLSBIN)/os9 format -t40 -ds -dd
-OS9FORMAT_DS80	= $(COCOTOOLSBIN)/os9 format -t80 -ds -dd
-OS9GEN		= $(COCOTOOLSBIN)/os9 gen
-OS9RENAME	= $(COCOTOOLSBIN)/os9 rename
-OS9ATTR		= $(COCOTOOLSBIN)/os9 attr -q
+#UNIX2OS9	= u2o
+#OS92UNIX	= o2u
+OS9FORMAT	= os9 format
+OS9FORMAT_SS35	= os9 format -t35 -ss -dd
+OS9FORMAT_SS40	= os9 format -t40 -ss -dd
+OS9FORMAT_SS80	= os9 format -t80 -ss -dd
+OS9FORMAT_DS40	= os9 format -t40 -ds -dd
+OS9FORMAT_DS80	= os9 format -t80 -ds -dd
+OS9GEN		= os9 gen
+OS9RENAME	= os9 rename
+OS9ATTR		= os9 attr -q
 OS9ATTR_TEXT	= $(OS9ATTR) -npe -npw -pr -ne -w -r
 OS9ATTR_EXEC	= $(OS9ATTR) -pe -npw -pr -e -w -r
-PADROM		= $(COCOTOOLSBIN)/os9 padrom
+PADROM		= os9 padrom
 MOUNT		= sudo mount
 UMOUNT		= sudo umount
 LOREMOVE	= sudo /sbin/losetup -d