[PD-cvs] externals/grill/flext/buildsys bmake.inc,1.2,1.3 build-gcc.sh,1.3,1.4 gnumake.inc,1.2,1.3 gnumake.mak,1.5,1.6 nmake.inc,1.2,1.3 readme.txt,1.2,1.3 targets-ext.inc,1.2,1.3 targets-flext.inc,1.2,1.3 targets.inc,1.3,1.4
Thomas Grill
xovo at users.sourceforge.net
Mon Jan 10 05:58:38 CET 2005
Update of /cvsroot/pure-data/externals/grill/flext/buildsys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16888/buildsys
Modified Files:
bmake.inc build-gcc.sh gnumake.inc gnumake.mak nmake.inc
readme.txt targets-ext.inc targets-flext.inc targets.inc
Log Message:
better templates, some minor changes
build system: added profiler mode, more fixes
Index: bmake.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/bmake.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bmake.inc 5 Jan 2005 05:04:08 -0000 1.2
--- bmake.inc 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 3,6 ****
--- 3,15 ----
##############################################
+ CFLAGS=$(CFLAGS) $(UFLAGS)
+
+ !ifdef DEBUG
+ CFLAGS=$(CFLAGS) /D_DEBUG $(DFLAGS)
+ !else
+ CFLAGS=$(CFLAGS) /DNDEBUG $(OFLAGS)
+ !endif
+
+
!ifdef SHARED
# --- shared ---
***************
*** 23,50 ****
!ifdef SHARED
!
! !ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_d
! !else
! FLEXTNAME=flext-$(RTSYS)
! !endif
!
!else
-
!ifdef THREADED
! !ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_td
!else
! FLEXTNAME=flext-$(RTSYS)_t
!endif
! !else
!ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_sd
!else
! FLEXTNAME=flext-$(RTSYS)_s
!endif
!endif
! !endif # SHARED
##############################################
--- 32,55 ----
!ifdef SHARED
! TYPEEXT=_
!else
!ifdef THREADED
! TYPEEXT=_t
!else
! TYPEEXT=_s
!endif
! !endif
!
!ifdef DEBUG
! MODEEXT=d
!else
! !ifdef PROFILE
! MODEEXT=p
! !else
! MODEEXT=
!endif
!endif
! FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT)
##############################################
Index: targets.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/targets.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** targets.inc 7 Jan 2005 04:58:45 -0000 1.3
--- targets.inc 10 Jan 2005 04:58:36 -0000 1.4
***************
*** 3,6 ****
--- 3,8 ----
build: build-default-default
+ profile: build-profile-default
+
clean: clean-default-default
***************
*** 15,18 ****
--- 17,22 ----
build-debug-all: build-debug-single build-debug-multi build-debug-shared
+ build-profile-all: build-profile-single build-profile-multi build-profile-shared
+
build-all-single: build-release-single build-debug-single
***************
*** 29,32 ****
--- 33,38 ----
install-debug-all: install-debug-single install-debug-multi install-debug-shared
+ install-profile-all: install-profile-single install-profile-multi install-profile-shared
+
install-all-single: install-release-single install-debug-single
***************
*** 43,46 ****
--- 49,54 ----
clean-debug-all: clean-debug-single clean-debug-multi clean-debug-shared
+ clean-profile-all: clean-profile-single clean-profile-multi clean-profile-shared
+
clean-all-single: clean-release-single clean-debug-single
***************
*** 57,60 ****
--- 65,71 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _build_
+ build-profile-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _build_
+
build-release-multi: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _build_
***************
*** 63,66 ****
--- 74,80 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _build_
+ build-profile-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _build_
+
build-release-shared: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _build_
***************
*** 69,72 ****
--- 83,89 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _build_
+ build-profile-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _build_
+
###########################################################
***************
*** 77,80 ****
--- 94,100 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _install_
+ install-profile-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _install_
+
install-release-multi: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _install_
***************
*** 83,86 ****
--- 103,109 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _install_
+ install-profile-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _install_
+
install-release-shared: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _install_
***************
*** 89,92 ****
--- 112,118 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _install_
+ install-profile-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _install_
+
###########################################################
***************
*** 97,100 ****
--- 123,129 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=single DEBUG=1 _clean_
+ clean-profile-single: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=single PROFILE=1 _clean_
+
clean-release-multi: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=multi THREADED=1 _clean_
***************
*** 103,106 ****
--- 132,138 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=multi THREADED=1 DEBUG=1 _clean_
+ clean-profile-multi: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=multi THREADED=1 PROFILE=1 _clean_
+
clean-release-shared: config
$(MAKE) $(OPTIONS) TARGETMODE=release TARGETTYPE=shared SHARED=1 _clean_
***************
*** 109,112 ****
--- 141,147 ----
$(MAKE) $(OPTIONS) TARGETMODE=debug TARGETTYPE=shared SHARED=1 DEBUG=1 _clean_
+ clean-profile-shared: config
+ $(MAKE) $(OPTIONS) TARGETMODE=profile TARGETTYPE=shared SHARED=1 PROFILE=1 _clean_
+
###########################################################
Index: targets-ext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/targets-ext.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** targets-ext.inc 5 Jan 2005 05:04:08 -0000 1.2
--- targets-ext.inc 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 7,10 ****
--- 7,12 ----
build-debug-default: build-debug-$(BUILDTYPE)
+ build-profile-default: build-profile-$(BUILDTYPE)
+
build-default-all: build-$(BUILDMODE)-all
Index: gnumake.mak
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gnumake.mak 7 Jan 2005 04:58:45 -0000 1.5
--- gnumake.mak 10 Jan 2005 04:58:36 -0000 1.6
***************
*** 74,77 ****
--- 74,79 ----
# include file describing default target dependencies
+ .PHONY : all build clean install profile
+
include $(BUILDPATH)targets.inc
***************
*** 80,84 ****
###############################################
! .precious: $(SYSCONFIG) $(USRCONFIG)
$(SYSCONFIG): $(SYSDEFAULT)
--- 82,86 ----
###############################################
! .PRECIOUS: $(SYSCONFIG) $(USRCONFIG)
$(SYSCONFIG): $(SYSDEFAULT)
Index: gnumake.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/gnumake.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gnumake.inc 5 Jan 2005 05:04:08 -0000 1.2
--- gnumake.inc 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 1,6 ****
##############################################
! # flext defines
##############################################
ifdef SHARED
# --- shared ---
--- 1,15 ----
##############################################
! # some compiler definitions
##############################################
+ CFLAGS += $(UFLAGS)
+
+ ifdef DEBUG
+ CFLAGS += -D_DEBUG $(DFLAGS)
+ else
+ CFLAGS += -DNDEBUG $(OFLAGS)
+ endif
+
+
ifdef SHARED
# --- shared ---
***************
*** 23,50 ****
ifdef SHARED
!
! ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_d
! else
! FLEXTNAME=flext-$(RTSYS)
! endif
!
else
-
ifdef THREADED
! ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_td
else
! FLEXTNAME=flext-$(RTSYS)_t
endif
! else
ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_sd
else
! FLEXTNAME=flext-$(RTSYS)_s
endif
endif
! endif # SHARED
##############################################
--- 32,55 ----
ifdef SHARED
! TYPEEXT=_
else
ifdef THREADED
! TYPEEXT=_t
else
! TYPEEXT=_s
endif
! endif
!
ifdef DEBUG
! MODEEXT=d
else
! ifdef PROFILE
! MODEEXT=p
! else
! MODEEXT=
endif
endif
! FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT)
##############################################
Index: build-gcc.sh
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/build-gcc.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** build-gcc.sh 7 Jan 2005 04:58:45 -0000 1.3
--- build-gcc.sh 10 Jan 2005 04:58:36 -0000 1.4
***************
*** 4,6 ****
make -f ${build}gnumake.mak PLATFORM=$1 RTSYS=$2 COMPILER=gcc BUILDPATH=${build} $3 $4 $5 $6 $7 $8 $9
-
--- 4,5 ----
Index: targets-flext.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/targets-flext.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** targets-flext.inc 5 Jan 2005 05:04:08 -0000 1.2
--- targets-flext.inc 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 7,10 ****
--- 7,12 ----
build-debug-default: build-debug-all
+ build-profile-default: build-profile-all
+
build-default-all: build-all-all
Index: readme.txt
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** readme.txt 7 Jan 2005 04:58:45 -0000 1.2
--- readme.txt 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 40,44 ****
with
! MODE: default, all, release, debug
TYPE: default, all, single, multi, shared
--- 40,44 ----
with
! MODE: default, all, release, debug, profile
TYPE: default, all, single, multi, shared
***************
*** 90,93 ****
--- 90,94 ----
if release, optimization flags will be used
if debug, debug information will be generated
+ if profile, profiling information will be generated (with debug info and optimization)
BUILDTYPE: single, multi or shared, default is single
Index: nmake.inc
===================================================================
RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/nmake.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** nmake.inc 5 Jan 2005 05:04:08 -0000 1.2
--- nmake.inc 10 Jan 2005 04:58:36 -0000 1.3
***************
*** 3,6 ****
--- 3,15 ----
##############################################
+ CFLAGS=$(CFLAGS) $(UFLAGS)
+
+ !ifdef DEBUG
+ CFLAGS=$(CFLAGS) /D_DEBUG $(DFLAGS)
+ !else
+ CFLAGS=$(CFLAGS) /DNDEBUG $(OFLAGS)
+ !endif
+
+
!ifdef SHARED
# --- shared ---
***************
*** 21,48 ****
!ifdef SHARED
!
! !ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_d
! !else
! FLEXTNAME=flext-$(RTSYS)
! !endif
!
!else
-
!ifdef THREADED
! !ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_td
!else
! FLEXTNAME=flext-$(RTSYS)_t
!endif
! !else
!ifdef DEBUG
! FLEXTNAME=flext-$(RTSYS)_sd
!else
! FLEXTNAME=flext-$(RTSYS)_s
!endif
!endif
! !endif # SHARED
##############################################
--- 30,53 ----
!ifdef SHARED
! TYPEEXT=_
!else
!ifdef THREADED
! TYPEEXT=_t
!else
! TYPEEXT=_s
!endif
! !endif
!
!ifdef DEBUG
! MODEEXT=d
!else
! !ifdef PROFILE
! MODEEXT=p
! !else
! MODEEXT=
!endif
!endif
! FLEXTNAME=flext-$(RTSYS)$(TYPEEXT)$(MODEEXT)
##############################################
More information about the Pd-cvs
mailing list