Commit fb50a854 authored by thomas's avatar thomas
Browse files

updated build system

git-svn-id: https://svn.grrrr.org/ext/trunk@937 4d9ac71a-51e6-0310-8455-cad1006bcd31
parent 7f05ba28
......@@ -5,7 +5,7 @@
# project-specific definitions
# package info
!include $(USRINFO)
!include $(PKGINFO)
# special package settings
!ifdef USRCONFIG
......
......@@ -8,23 +8,25 @@
###############################################
# package info
USRINFO=package.txt
!ifndef PKGINFO
PKGINFO=package.txt
!endif
!include $(USRINFO)
!include $(PKGINFO)
###############################################
# check variables
!ifndef BUILDCLASS
!error BUILDCLASS must be specified in $(USRINFO)
!error BUILDCLASS must be specified in $(PKGINFO)
!endif
!ifndef BUILDMODE
!error BUILDMODE must be specified in $(USRINFO)
!error BUILDMODE must be specified in $(PKGINFO)
!endif
!ifndef BUILDTYPE
!error BUILDTYPE must be specified in $(USRINFO)
!error BUILDTYPE must be specified in $(PKGINFO)
!endif
##############################
......@@ -44,7 +46,7 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def
OPTIONS=-f $(BUILDPATH)bmake-sub.mak -N \
PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO)
###############################################
......
......@@ -5,7 +5,7 @@ include $(BUILDPATH)config-$(PLATFORM)-$(RTSYS)-$(COMPILER).txt
# project specific definitions
# package info
include $(USRINFO)
include $(PKGINFO)
# special settings
ifdef USRCONFIG
......
......@@ -8,23 +8,25 @@
###############################################
# package info
USRINFO=package.txt
ifndef PKGINFO
PKGINFO=package.txt
endif
include $(USRINFO)
include $(PKGINFO)
###############################################
# check variables
ifndef BUILDCLASS
error BUILDCLASS must be specified in $(USRINFO)
error BUILDCLASS must be specified in $(PKGINFO)
endif
ifndef BUILDMODE
error BUILDMODE must be specified in $(USRINFO)
error BUILDMODE must be specified in $(PKGINFO)
endif
ifndef BUILDTYPE
error BUILDTYPE must be specified in $(USRINFO)
error BUILDTYPE must be specified in $(PKGINFO)
endif
##############################
......@@ -53,7 +55,7 @@ SYSDEFAULT=$(UBUILDPATH)$(PLATFORM)/$(RTSYS)/config-$(COMPILER).def
OPTIONS=-f $(UBUILDPATH)gnumake-sub.mak \
PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
BUILDPATH=$(UBUILDPATH) USRINFO=$(USRINFO)
BUILDPATH=$(UBUILDPATH) PKGINFO=$(PKGINFO)
###############################################
......
......@@ -5,7 +5,7 @@
# project-specific definitions
# package info
!include $(USRINFO)
!include $(PKGINFO)
# special package settings
!ifdef USRCONFIG
......
......@@ -8,23 +8,25 @@
###############################################
# package info
USRINFO=package.txt
!ifndef PKGINFO
PKGINFO=package.txt
!endif
!include $(USRINFO)
!include $(PKGINFO)
###############################################
# check variables
!ifndef BUILDCLASS
!error BUILDCLASS must be specified in $(USRINFO)
!error BUILDCLASS must be specified in $(PKGINFO)
!endif
!ifndef BUILDMODE
!error BUILDMODE must be specified in $(USRINFO)
!error BUILDMODE must be specified in $(PKGINFO)
!endif
!ifndef BUILDTYPE
!error BUILDTYPE must be specified in $(USRINFO)
!error BUILDTYPE must be specified in $(PKGINFO)
!endif
##############################
......@@ -44,7 +46,7 @@ SYSDEFAULT=$(BUILDPATH)$(PLATFORM)\$(RTSYS)\config-$(COMPILER).def
OPTIONS=-f $(BUILDPATH)nmake-sub.mak \
PLATFORM=$(PLATFORM) RTSYS=$(RTSYS) COMPILER=$(COMPILER) \
BUILDPATH=$(BUILDPATH) USRINFO=$(USRINFO)
BUILDPATH=$(BUILDPATH) PKGINFO=$(PKGINFO)
###############################################
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment