janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 20:13:32 +01:00
Code Activity

$(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build

Browse source 
This project was copied from ytools, with anything not related to providing
build-functionality left out. This commit replaces the occurences of ytools
with jw-build, and removes some but most certainly not all legacy ytools
references.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-04-07 12:15:48 +00:00
commit 55fa0eaec5
22 changed files with 92 additions and 662 deletions
Download patch file Download diff file Expand all files Collapse all files

2
make/defs-dev.mk
View file

@ -1,4 +1,4 @@
# ytools library
# jw-build library
# (c) 2001 jannet it services
# contact@jannet.de
# $Id$

2
make/defs-dist.mk
View file

@ -1,4 +1,4 @@
# ytools library
# jw-build library
# (c) 2001 jannet it services
# contact@jannet.de
# $Id$

12
make/defs.mk
View file

@ -2,8 +2,8 @@
# contact@jannet.de
# $Id$
ifndef YTOOLS_DEF_MK_INCLUDED
YTOOLS_DEF_MK_INCLUDED = true
ifndef JW_BUILD_DEF_MK_INCLUDED
JW_BUILD_DEF_MK_INCLUDED = true
include $(MODDIR)/make/platform.mk
include $(MODDIR)/make/projects.mk
@ -108,7 +108,7 @@ BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2)
CVS_RSH ?= /usr/bin/ssh
# ----- input dirs
YTOOLS_DIR = $(MODDIR)
JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
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)}')
@ -166,7 +166,7 @@ PKG_VENDOR ?= janware GmbH
FULL_NAME ?= $(shell id -nu | xargs getent passwd | cut -d: -f5)
USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_YTOOLS ?= true
USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true
ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
@ -790,9 +790,9 @@ ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -l$(LIBNAME)
endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),)
ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifeq ($(TARGET),mingw)
YTOOLS_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
endif
endif

2
make/git-submod.mk
View file

@ -1,4 +1,4 @@
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/ytools/bin/git-srv-admin.sh
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh
all:
install:

108
make/lib-deps.mk
View file

@ -77,7 +77,7 @@ SITE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/site /opt/$(
SITE_VERSION = $(call version,$(SITE_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
#INCLUDE += -I$(SITE_DIR)/include
#LIBFLAGS += -L$(SITE_DIR)/lib -lsite
#EXE_SEARCH_PATH += $(SITE_DIR)/bin
@ -89,7 +89,7 @@ JUX2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux2 /opt/$(
JUX2_VERSION = $(call version,$(JUX2_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
@ -107,7 +107,7 @@ JUX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux /opt/$(FL
JUX_VERSION = $(call version,$(JUX_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
@ -149,7 +149,7 @@ JUX_SHARED_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux-shared /
JUX_SHARED_VERSION = $(call version,$(JUX_SHARED_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-shared-devel = $(JUX_SHARED_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
@ -164,7 +164,7 @@ CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cca
CCASFS_VERSION = $(call version,$(CCASFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += cconsole
INCLUDE += -I$(CCASFS_DIR)/include
#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole
@ -196,7 +196,7 @@ DSPCD_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsp
DSPIDER_DSPCD_VERSION = $(call version,$(DSPCD_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(DSPIDER_DSPCD_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += dspider-shared
PREREQ_BUILD += userver
INCLUDE += -I$(DSPCD_DIR)/include
@ -211,7 +211,7 @@ DSPCD_EC_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsp
DSPIDER_DSPCD_EC_VERSION = $(call version,$(DSPCD_EC_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-ec-devel = $(DSPIDER_DSPCD_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += dspider-shared-ec
PREREQ_BUILD += userver xchange
INCLUDE += -I$(DSPCD_EC_DIR)/include
@ -225,7 +225,7 @@ DSPROUT_EXE_PREFIX = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dsp
DSPROUT_VERSION = $(call version,$(DSPROUT_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += dspider-shared
PREREQ_BUILD += userver
INCLUDE += -I$(DSPROUT_DIR)/include
@ -241,7 +241,7 @@ include $(DSPIDER_SHARED_DIR)/make/public.mk
DSPIDER_SHARED_VERSION = $(call version,$(DSPIDER_SHARED_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(DSPIDER_SHARED_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(DSPIDER_SHARED_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin
@ -255,7 +255,7 @@ include $(DSPIDER_SHARED_EC_DIR)/make/public.mk
DSPIDER_SHARED_EC_VERSION = $(call version,$(DSPIDER_SHARED_EC_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(DSPIDER_SHARED_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(DSPIDER_SHARED_EC_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EC_EXE_PREFIX)/lib -ldspider-shared-ec
EXE_SEARCH_PATH += $(DSPIDER_SHARED_EC_DIR)/bin
@ -269,7 +269,7 @@ FEEDFS_QT_VERSION = $(call version,$(FEEDFS_QT_DIR))
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-devel = $(FEEDFS_QT_VERSION)
PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_QT_DIR)/include
LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt
EXE_SEARCH_PATH += $(FEEDFS_QT_DIR)/bin
@ -283,7 +283,7 @@ FEEDFS_WT_VERSION = $(call version,$(FEEDFS_WT_DIR))
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION)
PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs-gui
PREREQ_BUILD += feedfs-ini
PREREQ_BUILD += wt-jannet
@ -336,7 +336,7 @@ FEEDFSD_VERSION = $(call version,$(FEEDFSD_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfsd-run = $(FEEDFSD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION)
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFSD_DIR)/include
LIBFLAGS += -L$(FEEDFSD_DIR)/lib -lfeedfsd
EXE_SEARCH_PATH += $(FEEDFSD_DIR)/bin
@ -349,7 +349,7 @@ FEEDFS_LDAP_VERSION = $(call version,$(FEEDFS_LDAP_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-ldap-run = $(FEEDFS_LDAP_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION)
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_LDAP_DIR)/include
LIBFLAGS += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap
EXE_SEARCH_PATH += $(FEEDFS_LDAP_DIR)/bin
@ -363,7 +363,7 @@ FEEDFS_UTILS_VERSION = $(call version,$(FEEDFS_UTILS_DIR))
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_UTILS_DIR)/include
LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils
EXE_SEARCH_PATH += $(FEEDFS_UTILS_DIR)/bin
@ -379,7 +379,7 @@ PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += xchange
PREREQ_BUILD += feedfs-fmemfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_NET_DIR)/include
LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin
@ -392,7 +392,7 @@ FEEDFS_PARPORT_VERSION = $(call version,$(FEEDFS_PARPORT_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-parport-run = $(FEEDFS_PARPORT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_PARPORT_DIR)/include
LIBFLAGS += -L$(FEEDFS_PARPORT_DIR)/lib -lfeedfs-parport
EXE_SEARCH_PATH += $(FEEDFS_PARPORT_DIR)/bin
@ -405,7 +405,7 @@ FEEDFS_CIRCUIT_VERSION = $(call version,$(FEEDFS_CIRCUIT_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-circuit-run = $(FEEDFS_CIRCUIT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-devel = $(FEEDFS_CIRCUIT_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_CIRCUIT_DIR)/include
LIBFLAGS += -L$(FEEDFS_CIRCUIT_DIR)/lib -lfeedfs-circuit
EXE_SEARCH_PATH += $(FEEDFS_CIRCUIT_DIR)/bin
@ -419,7 +419,7 @@ FEEDFS_INI_VERSION = $(call version,$(FEEDFS_INI_DIR))
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ini-devel = $(FEEDFS_INI_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_INI_DIR)/include
LIBFLAGS += -L$(FEEDFS_INI_DIR)/lib # -lfeedfs-ini
EXE_SEARCH_PATH += $(FEEDFS_INI_DIR)/bin
@ -486,7 +486,7 @@ FEEDFS_OBJECTS_VERSION = $(call version,$(FEEDFS_OBJECTS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION)
PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include
LIBFLAGS += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects
EXE_SEARCH_PATH += $(FEEDFS_OBJECTS_DIR)/bin
@ -498,7 +498,7 @@ FEEDFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/feedfs /opt/
FEEDFS_VERSION = $(call version,$(FEEDFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi
PREREQ_BUILD += auth
INCLUDE += -I$(FEEDFS_DIR)/include
@ -513,7 +513,7 @@ USERVER_VERSION = $(call version,$(USERVER_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION)
PREREQ_BUILD += xchange
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(USERVER_DIR)/include
LIBFLAGS += -L$(USERVER_DIR)/lib -luserver
EXE_SEARCH_PATH += $(USERVER_DIR)/bin
@ -550,7 +550,7 @@ XCHANGE_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/xchange /opt
XCHANGE_VERSION = $(call version,$(XCHANGE_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi
INCLUDE += -I$(XCHANGE_DIR)/include
LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange
@ -563,7 +563,7 @@ NTV2_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ntv2 /opt/$(
NTV2_VERSION = $(call version,$(NTV2_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ntv2-run = $(NTV2_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ntv2-devel = $(NTV2_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(NTV2_DIR)/include
LIBFLAGS += -L$(NTV2_DIR)/lib -lntv2
EXE_SEARCH_PATH += $(NTV2_DIR)/bin
@ -575,7 +575,7 @@ BTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/btools /opt/
BTOOLS_VERSION = $(call version,$(BTOOLS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(BTOOLS_DIR)/include
LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
EXE_SEARCH_PATH += $(BTOOLS_DIR)/bin
@ -587,7 +587,7 @@ JACKJART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/
JACKJART_VERSION = $(call version,$(JACKJART_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKJART_DIR)/include
LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart
EXE_SEARCH_PATH += $(JACKJART_DIR)/bin
@ -599,7 +599,7 @@ JACKRTAI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/
JACKRTAI_VERSION = $(call version,$(JACKRTAI_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKRTAI_DIR)/include
LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
EXE_SEARCH_PATH += $(JACKRTAI_DIR)/bin
@ -611,7 +611,7 @@ JACKDUMMY_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/
JACKDUMMY_VERSION = $(call version,$(JACKDUMMY_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKDUMMY_DIR)/include
LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
EXE_SEARCH_PATH += $(JACKDUMMY_DIR)/bin
@ -623,7 +623,7 @@ ALSART_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/io/
ALSART_VERSION = $(call version,$(ALSART_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(ALSART_DIR)/include
LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart
EXE_SEARCH_PATH += $(ALSART_DIR)/bin
@ -635,7 +635,7 @@ JACKMIX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspc
JACKMIX_VERSION = $(call version,$(JACKMIX_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackmix-devel = $(JACKMIX_VERSION)
PREREQ_BUILD += ytools btools
PREREQ_BUILD += jw-build btools
INCLUDE += -I$(JACKMIX_DIR)/include
LIBFLAGS += -L$(JACKMIX_DIR)/lib -ldspider-jackmix
LD_LIB_PATH += $(JACKMIX_DIR)/dsplib
@ -648,7 +648,7 @@ SCMJM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspc
SCMJM_VERSION = $(call version,$(SCMJM_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(SCMJM_DIR)/include
LIBFLAGS += -L$(SCMJM_DIR)/lib -ldspider-scmjm
LD_LIB_PATH += $(SCMJM_DIR)/dsplib
@ -661,7 +661,7 @@ SCM_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/dspc
SCM_VERSION = $(call version,$(SCM_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(SCM_DIR)/include
LIBFLAGS += -L$(SCM_DIR)/lib -ldspider-scm
EXE_SEARCH_PATH += $(SCM_DIR)/bin
@ -673,7 +673,7 @@ DSPFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspfs /opt/$
DSPFS_VERSION = $(call version,$(DSPFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(DSPFS_DIR)/include
LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs
EXE_SEARCH_PATH += $(DSPFS_DIR)/bin
@ -685,7 +685,7 @@ AUTH_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/auth /opt/$(
AUTH_VERSION = $(call version,$(AUTH_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi
INCLUDE += -I$(AUTH_DIR)/include
LIBFLAGS += -L$(AUTH_DIR)/lib -lauth
@ -698,7 +698,7 @@ EMSCREN_V8_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/emscren-v8 /
EMSCREN_V8_VERSION = $(call version,$(EMSCREN_V8_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-v8-run = $(EMSCREN_V8_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-v8-devel = $(EMSCREN_V8_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
#INCLUDE += -I$(EMSCREN_V8_DIR)/include
LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib
#LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib -lemscren-v8
@ -711,7 +711,7 @@ EMSCREN_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/emscren /op
EMSCREN_VERSION = $(call version,$(EMSCREN_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-run = $(EMSCREN_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-devel = $(EMSCREN_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(EMSCREN_DIR)/include
LIBFLAGS += -L$(EMSCREN_DIR)/lib
LIBFLAGS += -L$(EMSCREN_DIR)/lib -lemscren
@ -724,7 +724,7 @@ VALDI_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/valdi /opt/
VALDI_VERSION = $(call version,$(VALDI_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
#INCLUDE += -I$(VALDI_DIR)/include
LIBFLAGS += -L$(VALDI_DIR)/lib
#LIBFLAGS += -L$(VALDI_DIR)/lib -lvaldi
@ -739,7 +739,7 @@ FEEDFS_CMD_VERSION = $(call version,$(FEEDFS_CMD_DIR))
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-cmd-devel = $(FEEDFS_CMD_VERSION)
PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_CMD_DIR)/include
#LIBFLAGS += -L$(FEEDFS_CMD_DIR)/lib -lfeedfs-cmd
LIBFLAGS += -L$(FEEDFS_CMD_DIR)/lib
@ -752,7 +752,7 @@ SHELL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/shell /opt/
SHELL_VERSION = $(call version,$(SHELL_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)shell-run = $(SHELL_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)shell-devel = $(SHELL_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(SHELL_DIR)/include
LIBFLAGS += -L$(SHELL_DIR)/lib -lshell
EXE_SEARCH_PATH += $(SHELL_DIR)/bin
@ -792,7 +792,7 @@ FPTEST_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/fptest /opt
FPTEST_VERSION = $(call version,$(FPTEST_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FPTEST_DIR)/include
LIBFLAGS += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit
EXE_SEARCH_PATH += $(FPTEST_DIR)/bin
@ -804,7 +804,7 @@ FPANEL_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/fpanel /opt
FPANEL_VERSION = $(call version,$(FPANEL_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(FPANEL_DIR)/include
LIBFLAGS += -L$(FPANEL_DIR)/lib -lfpanel -L$(HOME)/opt/iowkit/lib -liowkit
EXE_SEARCH_PATH += $(FPANEL_DIR)/bin
@ -816,29 +816,29 @@ DEVNET_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/devnet /opt/$
DEVNET_VERSION = $(call version,$(DEVNET_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION)
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
INCLUDE += -I$(DEVNET_DIR)/include
LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet
EXE_SEARCH_PATH += $(DEVNET_DIR)/bin
PREREQ += DEVNET
endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),)
ifneq ($(PROJECT),ytools)
YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools))
ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifneq ($(PROJECT),jw-build)
JW_BUILD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jw-build /opt/$(FLAVOUR_PATH_PREFIX)jw-build))
else
YTOOLS_DIR = $(TOPDIR)
JW_BUILD_DIR = $(TOPDIR)
endif
YTOOLS_VERSION = $(call version,$(YTOOLS_DIR))
JW_BUILD_VERSION = $(call version,$(JW_BUILD_DIR))
RPM_REQUIRES_DEVEL += glib2-devel
ifneq ($(PROJECT),ytools)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION)
ifneq ($(PROJECT),jw-build)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jw-build-run = $(JW_BUILD_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jw-build-devel = $(JW_BUILD_VERSION)
endif
INCLUDE += -I$(YTOOLS_DIR)/include
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools
EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin
PREREQ += YTOOLS
INCLUDE += -I$(JW_BUILD_DIR)/include
LIBFLAGS += -L$(JW_BUILD_DIR)/lib -ljw-build
EXE_SEARCH_PATH += $(JW_BUILD_DIR)/bin
PREREQ += JW_BUILD
endif
ifeq ($(USE_SCOPE_CASMIX),true)

8
make/proj.mk
View file

@ -3,7 +3,7 @@
# contact@jannet.de
# $Id$
PROJECT = ytools
PROJECT = jw-build
MODDIR = $(TOPDIR)
JANWARE_WIKI = priv
@ -38,11 +38,11 @@ else
include $(TOPDIR)/make/cfg_dist.mk
endif
PREREQ_BUILD += ytools
PREREQ_BUILD += jw-build
USE_GLIB = true
CFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
CPPFLAGS += -D_USRDLL -DYTOOLS_EXPORTS
CFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS
CPPFLAGS += -D_USRDLL -DJW_BUILD_EXPORTS
#DEBUG_FORMAT_FLAG ?= -gstabs+
PROJECT_CFLAGS += $(DEBUG_FORMAT_FLAG)

17
make/project.conf
View file

@ -1,17 +1,8 @@
[summary]
janware GmbH LGPL project library
janware GmbH software build system
[description]
A library providing
o a software build system
o integration into the janware GmbH versioning and packaging system
o platform independent logging
o platform independent locking
o platform independent threads
o platform independent profiling
o a platform independent config file reader
o shared memory
A library providing an open software build an packaging system.
[global]
group = System/Libraries
@ -19,13 +10,11 @@ subpackages = run devel
license = LGPL 2
[pkg.required.os]
build = cvs, make, gcc, automake, autoconf, inkscape
build = cvs, make, automake, autoconf
[pkg.required.suse]
build = glib2-devel, boost-devel
release = rpmbuild
[pkg.required.debian]
build = libglib2.0-dev, libboost-dev
release = devscripts, debhelper, dput, libparse-debcontrol-perl, fakeroot

2
make/projects.mk
View file

@ -11,7 +11,7 @@ ifeq ($(DEVELOPMENT),true)
else
PROJECTS_DIR ?= /opt
endif
MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/devutil/scripts $(MODDIR)/bin))
MOD_SCRIPT_DIR ?= $(firstword $(wildcard $(MODDIR)/scripts $(MODDIR)/bin))
# -- Query the build system about other projects:
PYTHON ?= /usr/bin/python

2
make/qt-defs.mk
View file

@ -128,7 +128,7 @@ LPPFLAGS += $(QT_LDFLAGS) $(shell pkg-config --libs $(QT_MODULES))
INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- ytools defs
# ------------------------------- jw-build defs
UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc)

2
make/rules.mk
View file

@ -158,7 +158,7 @@ echo-modules:
@echo "JACKDUMMY : $(JACKDUMMY_DIR)"
@echo "ALSART : $(ALSART_DIR)"
@echo "DSPFS : $(DSPFS_DIR)"
@echo "YTOOLS : $(YTOOLS_DIR)"
@echo "JW_BUILD : $(JW_BUILD_DIR)"
@echo "SCOPE_CASMIX : $(SCOPE_CASMIX_DIR)"
echo-include:

4
make/suse-selection.mk
View file

@ -1,8 +1,6 @@
MODDIR = $(HOME)/local/src/cvs.main/proj/ytools
MODDIR = $(HOME)/local/src/cvs.main/proj/jw-build
include $(MODDIR)/make/defs.mk
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr

2
make/tex.mk
View file

@ -38,7 +38,7 @@ TEX_TMPL_BASE_DIR ?= $(MODDIR)/texdoc
TEX_TMPL_STYLE ?= de_technical
TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE)
IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl)
WWW_IMAGEDIR ?= $(CVS_PROJ_DIR)/ytools/htdocs/images/logo-janware/
WWW_IMAGEDIR ?= $(CVS_PROJ_DIR)/jw-build/htdocs/images/logo-janware/
FRONTLOGO_PDF ?= logo-janware.pdf
FRONTLOGO_EPS ?= janware-frontpage-top-right.png
FRONTLOGO_WEB ?= janware-frontpage-top-right.png

2
make/topdir.mk
View file

@ -112,7 +112,7 @@ git-config:
git remote set-url --push origin $(REMOTE_GIT_URL)
git-clone-to-remote:
ssh git.jannet.de "/opt/ytools/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)"
ssh git.jannet.de "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) create-personal-project $(RPM_PROJECT)"
git remote set-url --push origin $(REMOTE_GIT_URL)
git push --set-upstream origin master
git push --all $(REMOTE_GIT_URL)