janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

make: Replace sed by $(SED)

Browse source
This commit is contained in:
Jan Lindemann 2012-02-04 10:59:02 +00:00 • committed by Jan Lindemann
commit 9f4e02e618
18 changed files with 80 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

51
make/defs.mk
View file

@ -30,26 +30,29 @@ FLAVOUR_PATH_PREFIX ?= win32/
FLAVOUR_PATH_SUFFIX ?= /win32
endif
# ----- executables
SED = /usr/bin/sed
PROJECT_DESCR_FILE ?= $(wildcard $(TOPDIR)/doc/share/project.txt)
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | sed 's/.*\///; s/-[0-9].*//')))
PROJECT ?= $(patsubst $(FLAVOUR_PREFIX)%,%,$(notdir $(shell cd $(TOPDIR); pwd | $(SED) 's/.*\///; s/-[0-9].*//')))
PROJECT_SHORT_NAME ?= $(PROJECT)
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | sed 's/-/_/g')
PROJECT_CAPNAME = $(shell echo $(PROJECT) | tr [a-z] [A-Z] | $(SED) 's/-/_/g')
PROJECT_DESCR ?= No description
CUSTOMER ?= jannet
VERSION_FILE ?= $(firstword $(wildcard VERSION $(TOPDIR)/VERSION))
VERSION ?= $(shell cat $(VERSION_FILE))
DIST_VERSION ?= $(shell sed -e "s/-dev//" $(VERSION_FILE))
DIST_VERSION ?= $(shell $(SED) -e "s/-dev//" $(VERSION_FILE))
HEX_VERSION = $(shell echo $(DIST_VERSION) | \
sed 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
BINARY_VERSION = $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | sed 's/-[^-]*$$//; s/-/_/g')
WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
$(SED) 's/-dev//; s/pre[^\.]*//; s/F[^\.]//; s/[\.-]/ /g' | xargs printf "0x%02x%02x%02x%02x")
BINARY_VERSION = $(shell echo $(PROJECT)_$(DIST_VERSION) | tr [a-z] [A-Z] | $(SED) 's/-[^-]*$$//; s/-/_/g')
WINVERSION = $(shell echo $(VERSION) | $(SED) -e "s/\./_/g")
LOCAL_VERSION = $(shell echo $(VERSION))
LOCAL_WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
DIST_VERSION = $(shell echo $(VERSION) | sed -e "s/-dev//")
DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
LOCAL_WINVERSION = $(shell echo $(VERSION) | $(SED) -e "s/\./_/g")
DIST_VERSION = $(shell echo $(VERSION) | $(SED) -e "s/-dev//")
DIST_WINVERSION = $(shell echo $(WINVERSION) | $(SED) -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | $(SED) -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | $(SED) -e "s/-dev//")
MAJOR_MINOR_RELEASE = $(shell echo $(DIST_VERSION) | cut -d- -f1)
MAJOR_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f1)
MINOR_VERSION = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f2)
@ -71,7 +74,7 @@ MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODD
endif
YTOOLS_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
CVS_ROOT_DIR = $(shell test -d CVS && pwd | sed -e "s%`cat CVS/Repository`%%; s%/$$%%")
CVS_ROOT_DIR = $(shell test -d CVS && pwd | $(SED) -e "s%`cat CVS/Repository`%%; s%/$$%%")
REV_SUBDIRS = $(shell echo $(SUBDIRS) | awk '{for (i=NF; i>=1; i--) printf ("%s ",$$i)}')
FRESH_CVSDIR = $(HOME)/local/src/cvs.fresh
IMAGE_DIR ?= $(CVS_ROOT_DIR)/images
@ -113,8 +116,8 @@ else
endif
endif
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unu$(SED)-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\"
CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unu$(SED)-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\"
LDFLAGS += -Wall
ifneq ($(LOG_QUAL_PREFIX),)
@ -171,7 +174,7 @@ GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,
GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')
GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}')
LD_VERSION = $(shell ld -V | sed '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
LD_VERSION = $(shell ld -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//')
LD_MAJOR = $(shell echo $(LD_VERSION) | cut -d. -f1)
LD_MINOR = $(shell echo $(LD_VERSION) | cut -d. -f2)
LD_REV = $(shell echo $(LD_VERSION) | cut -d. -f3)
@ -181,7 +184,7 @@ UPDATE_REPO_SH = /opt/packager-server/bin/packager-server schedule-rebui
SRC_SUFFIX += $(sort $(suffix $(wildcard $(TOPDIR)/hdr/*)))
LOCAL_SRC += Makefile $(wildcard $(addprefix *,$(SRC_SUFFIX)))
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | sed '/:0$$/ d; s/:.*$$//'; fi)
SRC_HEADERED += $(shell if [ "$(LOCAL_SRC)" ]; then grep -ic "it services" $(LOCAL_SRC) | $(SED) '/:0$$/ d; s/:.*$$//'; fi)
SRC_UNHEADERED += $(filter-out $(SRC_HEADERED),$(LOCAL_SRC))
LOCAL_C += $(wildcard *.c)
LOCAL_CPP += $(wildcard *.cc *.cpp *.C)
@ -293,8 +296,8 @@ LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME).a
SO_SUFFIX = so.$(shell echo $(VERSION) | cut -d- -f1)
SO_PREFIX ?= lib
LIB_SO = $(BUILD_LIBDIR)/lib$(LIBNAME).$(SO_SUFFIX)
LINKS_SO += $(shell echo $(LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | sed -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
LINKS_SO += $(shell echo $(LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(LIB_SO))
INSTALLED_LINKS_SO += $(shell echo $(INSTALLED_LIB_SO) | $(SED) -e "s/\.so\..*$$/.so/" | grep -v $(INSTALLED_LIB_SO))
INSTALLED_LIB_A = $(INSTALL_LIBDIR)/lib$(LIBNAME).a
else
LIB_A = $(BUILD_LIBDIR)/lib$(LIBNAME)-static.a
@ -358,7 +361,7 @@ INSTALLED_CGI += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
# -- HTML
BUILD_HTMLDIR = $(TOPDIR)/htdocs
LOCAL_HTML += $(wildcard *.html *.css *.php) $(IMAGES)
HTML_SUBDIR ?= $(shell pwd | sed 's%.*/htdocs/%%')
HTML_SUBDIR ?= $(shell pwd | $(SED) 's%.*/htdocs/%%')
ifeq ($(HTML_SUBDIR),)
INSTALL_HTMLDIR = $(PROJECT_HTMLDIR)
else
@ -535,20 +538,20 @@ define cvs_files
endef
define add_flavour_prefix
sed "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
$(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
endef
define beautify_lib_path
sed 's/:/\n + /g'
$(SED) 's/:/\n + /g'
endef
#$(shell cat $1/VERSION | sed 's/-dev//; s/-[^-]*$$//')
#$(shell cat $1/VERSION | $(SED) 's/-dev//; s/-[^-]*$$//')
define cat_version
$(shell cat $1/VERSION | sed 's/-dev//')
$(shell cat $1/VERSION | $(SED) 's/-dev//')
endef
define version
$(shell cat $1/VERSION | sed 's/-.*//')
$(shell cat $1/VERSION | $(SED) 's/-.*//')
endef
define install_links