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

$(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

481
CHANGES
View file

@ -1,478 +1,7 @@
YTools Lib Changes File jw-build Changes File
----------------------- ---------------------
$Id$ Version 1.0.0-0
1.1.0-34
--------
o usrv: fixed memory leak while sending
1.1.2-0
--------
o usrv: added on_close_connection callback
1.1.2-2
-------
o usrv: cleaning up IPC pipe sockets after process termination
1.1.2-3
-------
o usrv: bugfix: segfault after connection termination
1.1.2-4
-------
o usrv: bugfix: segfault after connection termination (uncorrect unregister of
invalidated connections)
1.1.2-5
-------
o usrv: bugfix: various minor coredumps, mostly related to connection lists
1.1.3-0
-------
o usrv: added on_new_connection() callback
1.1.3-1
-------
o hash/md5: fixed major memory leak in file2md5()
o added support for mpatrol library
1.1.3-2
-------
o misc: added mem_snapshot() and mem_dump()
o misc: bugfix: mem_free() did not work correctly
o usrv: bugfix: incomimg messages were not freed
o msgfmt: bugfix: parse() had small memory leaks
1.1.3-3
-------
o compiling release version with NDEBUG (switching off assertions)
1.1.3-4
-------
o bugfix: client handler process did not exit after connection reset by client
1.1.3-5
-------
o /usr/local/ftp -> /home/ftp
1.1.3-6
-------
o replaced assert(0) with abort()
1.1.4-0
-------
o added client_ tcp socket options to server configuration struct
o added some assertions to module msgfmt
1.1.4-0F1
---------
o now not including autobuilt files in tar archive
o now using sh instead of exec to start mkspec in mkspec_wrapper.sh, better
because of permissions
o now allowing characters in rpm patchlevel dependencies in mkspec_wrapper.sh
1.1.4-1
-------
o jcs setval: added -n switch and fixed multi-word handling
o enhancement to yupdate.sh (floppy config file detection support)
1.1.4-2
-------
o bugfix in yupdate.sh: broken command line parsing
1.1.5-0
-------
o uclnt: beautified error messages in YConnection
o usrv: added snd_timeout and rcv_timeout options
o usrv: added usrv_shutdown_process()
1.1.5-1
-------
o uclnt: added first (untested) support for heartbeat function
o usrv: added timeout to write_to_socket() and callers
o YStopWatch: added some convenience overloads and onAlarm() callbacks
o YStopWatchThreadList: minor fixes to generate_function_timers.sh
o misc: added get_time_diff()
1.1.5-2
-------
o devutil/scripts: fixed comment handling
o devutil/scripts: update.sh fixed groups and added some informational opts (-x,-p)
1.1.5-2F1
---------
o merged changes of 1.1.4-0 -> 1.1.4-0F1
1.1.5-2F2
---------
o now compiling distribution version with compiler debug options
1.1.5-2F3
---------
o backported yupdate.sh and jcs from ytools 1.1.8-0
1.1.6-0
-------
o YThread: added context argument to callbacks
o YMidi: first appearance of this module
o yupdate: fix in comment handling
1.1.7-0
-------
o big changes everywhere, triggered by different uclnt thread scheme
1.1.7-1
-------
o preserving targets over config target invocation
o added hdr to module script/devutils
o added YTimeB: added getDateStr()
o YThread: Big redesign, mostly because everything is now
handled in one giant switch / case statement
o slog: now logging timestamps to console, too
o slog: added get_log_prio_str()
o misc: added pthread_join_strerror()
o YError: nicer timestamps
o YQueue: bugfix in ETIMEDOUT
o make: moved trace and other options from ytools.mk.in into defs.mk.in
to make them visible for other projects, too
o YMutex: added derived YDummyMutex class for debugging
o usrv: now understanding up_terminate and sending back down_terminate
triggering on_close_connection()
o uclnt: bugfix: did not correctly deal with empty messages
o uclnt: big rewrite (again), now using five threads beside the main thread:
- YStateMagager: managing all the state changes
- YInDispatcher: reading inbound messages from the network and passing them
on either to YCbQueue or to YMsgWindowQueue
- YOutQueue: queuing outbound messages
- YCbQueue: queing messages for all callbacks except onError()
- YMsgWindowQueue: queing messages for onError()
o YStopWatch: bugfix, was alarmed by to long step times, even if step times
was off
o YThread: added getFlags(), setFlags(), addFlags(), delFlags()
o slog: now supporting callstack traces
o uclnt/usrv: now supporting application defined down_terminate messages
o YMutex: made YDummyMutex YDebugMutex and made it lock again
o make: now supporting local.mk
o make: added linux-rpm.mk
1.1.8-0
-------
o merged changes of V_1_1_7_1_JL
o slog: added possibility for multiple nested slog_open() calls
o uclnt: fixed uncaught exception during YMsgDispatcher::_dispatchEvent()
o merged changes from V_1_1_5_2_FIXES and corrected YStopWatchThreadList
related issues
o devutil/jcs and make: added support for specifying a bootlabel in kernel
rpm build process; added asm to asm-$ARCH link in kernel include
o devutil/jcs and make: now adding an EXTRAVERSION string to `uname -r`
1.1.8-1
-------
o merged changes of V_1_1_5-2 -> V_1_1_5-2F3
o msgfmt: bugfix, fmt_user was not correctly recognized, breaking up_format.c
o usrv: bugfix, "allclients" destination was ignored
o benno added "#include <errno.h>" to contr/YQueue/YQueue.h
1.1.8-2
-------
o merged changes of V_1_1_5-2F3 -> V_1_1_5-2F4
1.1.8-3
-------
o make/rpmdist.mk: added target ftag
o slog: now logging hint about initlog() being deprecated
o YThread: now logging pthread_self() on entering thread
o misc: added pthread_self_str()
o YStopWatchThreadList: fixed generate_function_timer to work with SuSE 9.1 sed
o usrv: bugfix, server not quitting anylonger after termination of child
o uclnt: now continuing write on EWOULDBLOCK, TODO: use select(), or, at least,
implement a timeout
o scripts: now calling nice -10 on cptree.sh
o contr Y2WayMap:
- fixed typedef foo_t to typedef typename foo_t
- added dummy Y2WayMap.cpp to make Y2WayMap fail in ytools directory if buggy
1.1.8-4
-------
o added support for QT ui generation from .ui files
1.1.9-0
-------
o uclnt: - Added YMsgDispatcher::getAddress()
- added getCount()
- added instance count to thread names
- made some getXX() functions const
o slog: - now not logging date, process id, id to console anylonger by default
- introduced mutex to be able to use static buffer
1.1.10-0
--------
o YError: - added setFile() and setLine() methods
o YOptString: - newly added
o usrv: - fixed crash due to race in unregistering from connection list
- fixed memory leaks in YServer.cpp
- major rewrite and renaming of classes
- optimized memory management
- added memory debugger
o misc: - now logging mpatrol mem_dump() to syslog
o contr: - added module YLifo
o YOsc: - rewrite
o slog, platform, misc unified into module base
o YThread: - added setFlags(), addFlags(), delFlags() and changed setName() to
avoid deadlock
o inifile: - now supporting quoted strings as values
- added inifile_val() and inifile_str() macros
o scripts: - some fixes to cvs_mail.sh
o make: - some indentation cleanup in defs.mk.in
- made all targets depend on all.done
- fixed plugin.mk
o platform: - added winerrno.h; will be removed again
1.1.10-1
--------
o fixed build with some broken LOCAL_PREREQ definitions
o base: - bugfix in file_basename()
- added - remove_command_line_option()
- asciify()
- parse_geometry_string()
- ytools_strtok_r()
- vslog()
- ftruncate() for windows
o inifile: - bugfix in dump()
o YApplication: newly added MVC framework
o make: - moved compiler optimization and such from project dirs into defs.mk.in
1.1.10-2
--------
o now supporting gcc 4.0, fixed some uninitialized vars and some syntax while at it
o now supporting x86_64
o base/misc: added consume_bytes_from_pipe()
o slog: slog() inline
o beautified some Makefiles (FIND_SUBDIRS)
o make:
- decoupled USE_COMPILER_OPTIMIZATION_OPTS from USE_DEBUG_OPS
- added USE_ASSERTIONS
- not using qt4 debug libs anylonger
- added run.mk
o YShMem: made a couple of functions inline
o uclnt/cpp: fixed some uninitialized variables, possibly harming stability (thread id)
o contr: added YPath
1.1.10-3
--------
o base: fixed O_TRUNC in ytools_open()
o uclnt:
- improved logging
- now pushing format ids by reference into YDataBox
1.1.10-4
--------
o misc:
- bugfix (by Benno): fixed read end condition in afs_read_from_fd()
o inifile:
- bugfix: short subsections weren't matched by match_super(),
breaking inifile_get_num_sections()
- inifile handle is now of (opaque) type struct inifile
1.1.11-0
--------
o inifile:
- complete redesign behind the scenes, now depending on YStringTree
o YMisc:
- added cropstr() and unquote()
o make:
- replaced ytools.mk -> proj.mk and MODDIR definition by TOPDIR definition
to be consistent with other projects
Version 1.1.12-0
--------------- ---------------
o patched mingw gcc (gcc bug 24196) Split off from from ytools 1.2.14-12. Removed everything which isn't directly
meaningful to software build and packaging functionality.
Version 1.1.13-0
----------------
o added new members _longname() and _logname() to YAbstractFamilyMember
Version 1.1.14-0
----------------
o added new overloads vdump() to YStringTree
Version 1.1.15-0
----------------
o added YStringTree::insertChild(int pos, const std::string &content)
Version 1.1.16-0
----------------
o added new member YLifo::empty()
Version 1.1.17-0
----------------
o changed enum order for URLTOK_XXX
o added _dump() and clear() to YEloopEventQueue
o made dtor of YAbstractStandaloneTask virtual
o added logChildren() to YAbstractFamilyMember
o made eloop_register_timer() timeout argument const
Version 1.1.18-0
----------------
o added process() and friends to YAbstractFamilyMember
Version 1.1.19-0
----------------
o added _nDeliveries to YAbstractFamilyMember
o made _name() not purely virtual if _DEVELOPMENT_ is undefined
o added int YQueue<QElem>::erase(const QElem &elem)
Version 1.1.20-0
----------------
o added members to YAppCmdLine
o added errnum() and strerror() to file_ops
Version 1.1.21-0
----------------
o added members to YAppCmdLine and YAbstractApplication
Version 1.1.22-0
----------------
o added members setFlags(), addFlags(), flags() to YAbstractLoadableObject
Version 1.1.23-0
----------------
o added member _notifierSignal and _sigmask to YAppEloop
Version 1.1.24-0
----------------
o made YLifo::emtpy() and YFifo::empty() const
o added YEloopTimerTask::timeLeft()
o added beautified private YStringTree::_dump() method
Version 1.1.25.0
----------------
o merged changes from V_1_1_24_11_ONTOLOGY
Version 1.1.26.0
----------------
o slog:
- made slog() a macro
- old slog() is now do_slog()
o YAbstractFamilyMember:
- added doom() and doomed()
- changed signature of watch callbacks
- renamed slog() methods to do_slog()
Version 1.1.27.0
----------------
o added YAbstractFamilyMember::vdump()
o added -D_FILE_OFFSET_BITS=64 by default to CFLAGS
Version 1.1.28.0
----------------
o added YAbstractLoadableObject::subconf()
Version 1.1.29.0
----------------
o added YAbstractApplication::_lockFd and _lockFilePath
Version 1.1.30.0
----------------
o merged changes from V_1_1_29_40_POST_ACCEPTANCE:
- YAppEloop(): added YAbstractFamilyMember *parent to ctor
- YAbstractFamilyMember: added const char *logname() const
- file_io ops, added:
int (*lstat64)(void *context, const char *path, struct stat64 *buf);
int (*symlink)(void *context, const char *oldpath, const char *newpath);
int (*readlink)(void *context, const char *path, char *buf, size_t bufsize);
- YStringTree:
- added:
int setLinkTraits(int flags);
const char *childContent(const char *item_, int idx=0) const;
YStringTree *child(const std::string &name, int flags = f_resolve_symlinks);
YStringTree *child(int index);
bool isLink() const;
const YStringTree *root() const;
- added many private methods
Version 1.1.31.0
----------------
o YAbstractFamilyMember: added support for garbage collector
Version 1.2.0-0
---------------
o merged changes from V_1_1_31_6_POST_ACCEPTANCE
Version 1.2.1-0
---------------
o merged changes from V_1_2_0_35_NEUHAUS
Version 1.2.2
-------------
o merged changes from V_1_2_1_7_NEUHAUS
Version 1.2.3
-------------
o changed interfaces of YVariant and YStringTree
o joined V_1_2_3_20_CASAS_NOVAS
Version 1.2.4
-------------
o merged changes from V_1_2_3_33_YAPPLICATION_INIFILE_CTOR
Version 1.2.5
-------------
o added signature() to YAbstractFamilyMember
o timer return values changed
o removed non-const YAbstractFamilyMember::parent()
Version 1.2.6
-------------
o added support for recording origins in YStringTree with new class YSTMetaInfo
Version 1.2.7
-------------
o added hooks for YAbstractAppliction two-phase __init()
(needed for filling commandline later in the process)
o fixed ScopedRef refcounting with assignment and copy-ctor
Version 1.2.8
-------------
o added YAbstractFamilyMember::addFlags(), delFlags(), setFlags(), flags()
o added YAbstractFamilyMember::dumpTree()
o added support for YAbstractFamilyMember::f_trace_refcount
o reimplemented YAbstractFamilyMember::_dump() in YEloopEventNotifier
Version 1.2.9
-------------
o reimplementation in YAbstractEloopTimerTask::_dump()
o made YAbstractFamilyMember::setParent() virtual
Version 1.2.10
--------------
o YAbstractEloopTimerTask:
- renamed restart() to reset()
- added startTimer() and stopTimer()
- interpreted _timeout() return value YTASK_RETVAL_DEFAULT and
YTASK_RETVAL_RELOOP equally
Version 1.2.11
--------------
o YCmdLine:
- added setDescription() and description()
- added argTraits(), publicly exposing argument traits
- removed moot setUsage()
o YApplicateion:
- made _deliverEvents() protected instead of private
Version 1.2.12
--------------
o reordered URLTOK_ values
Version 1.2.13
--------------
added YLoadableObject::load() overload allowing to specify a custom prefix
Version 1.2.14
--------------
several binary incompatible changes

57
Makefile
View file

@ -1,60 +1,7 @@
# jan's utility modules
# (c) 2001-2005 jannet it services
# contact@jannet.de
# $Id$
TOPDIR = . TOPDIR = .
SUBDIRS = make scripts bin texdoc
SUBDIRS = inst/pre \
make \
pkgconfig \
contrib \
devutil \
initrd \
doc \
htdocs tmpl \
base \
YMisc \
YFamily \
hashfunc \
lbuffer cache \
YMem YOptString \
gtopts \
misc \
parser \
lock sigsync shmem \
contr/YMtBuf \
contr/YRrBuf \
contr/YRrLogBuf \
contr/YStringTree \
cfgfile \
YStopWatch \
YEvent \
contr \
YLoadableObject \
msgfmt eloop statecheck \
YCbContr YThread \
YStopWatchList YStopWatchQueue YStopWatchThreadList \
YApplication \
YOsc os \
lib include bin \
util \
conf \
inst/post
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@ftp.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION) RPM_UPLOAD_URLPREFIX ?= rsync_ssh://$(JANWARE_USER)@ftp.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
include $(MODDIR)/make/topdir-autoconf.mk include $(MODDIR)/make/topdir.mk
define symversion
nm $(LIB_A) | sed '/^[0-9]\{8\} T / !d; s/^[0-9]\{8\} T //' | sort -u
endef
SYMBOLS: $(LIB_A)
$(symversion) > $@.tmp
mv $@.tmp $@
check_symversion:
$(symversion) | diff SYMBOLS - | sed '/^</ !d'

2
VERSION
View file

@ -1 +1 @@
1.2.14-12-dev 1.0.0-0-dev

2
make/defs-dev.mk
View file

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

2
make/defs-dist.mk
View file

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

12
make/defs.mk
View file

@ -2,8 +2,8 @@
# contact@jannet.de # contact@jannet.de
# $Id$ # $Id$
ifndef YTOOLS_DEF_MK_INCLUDED ifndef JW_BUILD_DEF_MK_INCLUDED
YTOOLS_DEF_MK_INCLUDED = true JW_BUILD_DEF_MK_INCLUDED = true
include $(MODDIR)/make/platform.mk include $(MODDIR)/make/platform.mk
include $(MODDIR)/make/projects.mk include $(MODDIR)/make/projects.mk
@ -108,7 +108,7 @@ BUILD_NUMBER = $(shell echo $(DIST_VERSION) | cut -d- -f2)
CVS_RSH ?= /usr/bin/ssh CVS_RSH ?= /usr/bin/ssh
# ----- input dirs # ----- input dirs
YTOOLS_DIR = $(MODDIR) JW_BUILD_DIR = $(MODDIR)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION) 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)}') 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) FULL_NAME ?= $(shell id -nu | xargs getent passwd | cut -d: -f5)
USE_PROJECT_LIB ?= true USE_PROJECT_LIB ?= true
EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB) EXPORT_PROJECT_LIB ?= $(USE_PROJECT_LIB)
USE_YTOOLS ?= true USE_JW_BUILD ?= true
USE_EXCEPTIONS_IN_C ?= true USE_EXCEPTIONS_IN_C ?= true
REENTRANT ?= true REENTRANT ?= true
ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),) ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
@ -790,9 +790,9 @@ ifeq ($(USE_PROJECT_LIB),true)
PROJECTLIB_LDFLAGS += -l$(LIBNAME) PROJECTLIB_LDFLAGS += -l$(LIBNAME)
endif endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),) ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifeq ($(TARGET),mingw) ifeq ($(TARGET),mingw)
YTOOLS_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++ JW_BUILD_LDFLAGS += -lglib-2.0 -lws2_32 -lstdc++
endif endif
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: all:
install: 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)) SITE_VERSION = $(call version,$(SITE_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)site-run = $(SITE_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)site-devel = $(SITE_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
#INCLUDE += -I$(SITE_DIR)/include #INCLUDE += -I$(SITE_DIR)/include
#LIBFLAGS += -L$(SITE_DIR)/lib -lsite #LIBFLAGS += -L$(SITE_DIR)/lib -lsite
#EXE_SEARCH_PATH += $(SITE_DIR)/bin #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)) JUX2_VERSION = $(call version,$(JUX2_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux2-run = $(JUX2_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux2-devel = $(JUX2_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
@ -107,7 +107,7 @@ JUX_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jux /opt/$(FL
JUX_VERSION = $(call version,$(JUX_DIR)) JUX_VERSION = $(call version,$(JUX_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-run = $(JUX_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-devel = $(JUX_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils 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)) JUX_SHARED_VERSION = $(call version,$(JUX_SHARED_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jux-shared-run = $(JUX_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jux-shared-devel = $(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
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
@ -164,7 +164,7 @@ CCASFS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/dspc/src/cca
CCASFS_VERSION = $(call version,$(CCASFS_DIR)) CCASFS_VERSION = $(call version,$(CCASFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-ccasfs-run = $(CCASFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-ccasfs-devel = $(CCASFS_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += cconsole PREREQ_BUILD += cconsole
INCLUDE += -I$(CCASFS_DIR)/include INCLUDE += -I$(CCASFS_DIR)/include
#LIBFLAGS += -L$(CCONSOLE_DIR)/lib -lcconsole #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)) DSPIDER_DSPCD_VERSION = $(call version,$(DSPCD_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-run = $(DSPIDER_DSPCD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-devel = $(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 += dspider-shared
PREREQ_BUILD += userver PREREQ_BUILD += userver
INCLUDE += -I$(DSPCD_DIR)/include 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)) DSPIDER_DSPCD_EC_VERSION = $(call version,$(DSPCD_EC_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-dspcd-ec-run = $(DSPIDER_DSPCD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-dspcd-ec-devel = $(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 += dspider-shared-ec
PREREQ_BUILD += userver xchange PREREQ_BUILD += userver xchange
INCLUDE += -I$(DSPCD_EC_DIR)/include 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)) DSPROUT_VERSION = $(call version,$(DSPROUT_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dsprout-run = $(DSPROUT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dsprout-devel = $(DSPROUT_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += dspider-shared PREREQ_BUILD += dspider-shared
PREREQ_BUILD += userver PREREQ_BUILD += userver
INCLUDE += -I$(DSPROUT_DIR)/include INCLUDE += -I$(DSPROUT_DIR)/include
@ -241,7 +241,7 @@ include $(DSPIDER_SHARED_DIR)/make/public.mk
DSPIDER_SHARED_VERSION = $(call version,$(DSPIDER_SHARED_DIR)) DSPIDER_SHARED_VERSION = $(call version,$(DSPIDER_SHARED_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-run = $(DSPIDER_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-devel = $(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 INCLUDE += -I$(DSPIDER_SHARED_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared LIBFLAGS += -L$(DSPIDER_SHARED_EXE_PREFIX)/lib -ldspider-shared
EXE_SEARCH_PATH += $(DSPIDER_SHARED_DIR)/bin 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)) DSPIDER_SHARED_EC_VERSION = $(call version,$(DSPIDER_SHARED_EC_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-shared-ec-run = $(DSPIDER_SHARED_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-shared-ec-devel = $(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 INCLUDE += -I$(DSPIDER_SHARED_EC_DIR)/include
LIBFLAGS += -L$(DSPIDER_SHARED_EC_EXE_PREFIX)/lib -ldspider-shared-ec LIBFLAGS += -L$(DSPIDER_SHARED_EC_EXE_PREFIX)/lib -ldspider-shared-ec
EXE_SEARCH_PATH += $(DSPIDER_SHARED_EC_DIR)/bin 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) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-qt-devel = $(FEEDFS_QT_VERSION)
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_QT_DIR)/include INCLUDE += -I$(FEEDFS_QT_DIR)/include
LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt LIBFLAGS += -L$(FEEDFS_QT_DIR)/lib -lfeedfs-qt
EXE_SEARCH_PATH += $(FEEDFS_QT_DIR)/bin 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) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-wt-devel = $(FEEDFS_WT_VERSION)
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += feedfs-gui PREREQ_BUILD += feedfs-gui
PREREQ_BUILD += feedfs-ini PREREQ_BUILD += feedfs-ini
PREREQ_BUILD += wt-jannet 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_RUN += $(FLAVOUR_PREFIX)feedfsd-run = $(FEEDFSD_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfsd-devel = $(FEEDFSD_VERSION)
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFSD_DIR)/include INCLUDE += -I$(FEEDFSD_DIR)/include
LIBFLAGS += -L$(FEEDFSD_DIR)/lib -lfeedfsd LIBFLAGS += -L$(FEEDFSD_DIR)/lib -lfeedfsd
EXE_SEARCH_PATH += $(FEEDFSD_DIR)/bin 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_RUN += $(FLAVOUR_PREFIX)feedfs-ldap-run = $(FEEDFS_LDAP_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ldap-devel = $(FEEDFS_LDAP_VERSION)
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_LDAP_DIR)/include INCLUDE += -I$(FEEDFS_LDAP_DIR)/include
LIBFLAGS += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap LIBFLAGS += -L$(FEEDFS_LDAP_DIR)/lib -lfeedfs-ldap -lldap
EXE_SEARCH_PATH += $(FEEDFS_LDAP_DIR)/bin 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) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-utils-devel = $(FEEDFS_UTILS_VERSION)
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_UTILS_DIR)/include INCLUDE += -I$(FEEDFS_UTILS_DIR)/include
LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils LIBFLAGS += -L$(FEEDFS_UTILS_DIR)/lib -lfeedfs-utils
EXE_SEARCH_PATH += $(FEEDFS_UTILS_DIR)/bin EXE_SEARCH_PATH += $(FEEDFS_UTILS_DIR)/bin
@ -379,7 +379,7 @@ PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += xchange PREREQ_BUILD += xchange
PREREQ_BUILD += feedfs-fmemfs PREREQ_BUILD += feedfs-fmemfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_NET_DIR)/include INCLUDE += -I$(FEEDFS_NET_DIR)/include
LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net LIBFLAGS += -L$(FEEDFS_NET_DIR)/lib -lfeedfs-net
EXE_SEARCH_PATH += $(FEEDFS_NET_DIR)/bin 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_RUN += $(FLAVOUR_PREFIX)feedfs-parport-run = $(FEEDFS_PARPORT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-parport-devel = $(FEEDFS_PARPORT_VERSION)
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_PARPORT_DIR)/include INCLUDE += -I$(FEEDFS_PARPORT_DIR)/include
LIBFLAGS += -L$(FEEDFS_PARPORT_DIR)/lib -lfeedfs-parport LIBFLAGS += -L$(FEEDFS_PARPORT_DIR)/lib -lfeedfs-parport
EXE_SEARCH_PATH += $(FEEDFS_PARPORT_DIR)/bin 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_RUN += $(FLAVOUR_PREFIX)feedfs-circuit-run = $(FEEDFS_CIRCUIT_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-devel = $(FEEDFS_CIRCUIT_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-circuit-devel = $(FEEDFS_CIRCUIT_VERSION)
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_CIRCUIT_DIR)/include INCLUDE += -I$(FEEDFS_CIRCUIT_DIR)/include
LIBFLAGS += -L$(FEEDFS_CIRCUIT_DIR)/lib -lfeedfs-circuit LIBFLAGS += -L$(FEEDFS_CIRCUIT_DIR)/lib -lfeedfs-circuit
EXE_SEARCH_PATH += $(FEEDFS_CIRCUIT_DIR)/bin 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) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-ini-devel = $(FEEDFS_INI_VERSION)
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_INI_DIR)/include INCLUDE += -I$(FEEDFS_INI_DIR)/include
LIBFLAGS += -L$(FEEDFS_INI_DIR)/lib # -lfeedfs-ini LIBFLAGS += -L$(FEEDFS_INI_DIR)/lib # -lfeedfs-ini
EXE_SEARCH_PATH += $(FEEDFS_INI_DIR)/bin 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_RUN += $(FLAVOUR_PREFIX)feedfs-objects-run = $(FEEDFS_OBJECTS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-objects-devel = $(FEEDFS_OBJECTS_VERSION)
PREREQ_BUILD += feedfs PREREQ_BUILD += feedfs
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include INCLUDE += -I$(FEEDFS_OBJECTS_DIR)/include
LIBFLAGS += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects LIBFLAGS += -L$(FEEDFS_OBJECTS_DIR)/lib -lfeedfs-objects
EXE_SEARCH_PATH += $(FEEDFS_OBJECTS_DIR)/bin 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)) FEEDFS_VERSION = $(call version,$(FEEDFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)feedfs-run = $(FEEDFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-devel = $(FEEDFS_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi PREREQ_BUILD += valdi
PREREQ_BUILD += auth PREREQ_BUILD += auth
INCLUDE += -I$(FEEDFS_DIR)/include 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_RUN += $(FLAVOUR_PREFIX)userver-run = $(USERVER_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)userver-devel = $(USERVER_VERSION)
PREREQ_BUILD += xchange PREREQ_BUILD += xchange
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(USERVER_DIR)/include INCLUDE += -I$(USERVER_DIR)/include
LIBFLAGS += -L$(USERVER_DIR)/lib -luserver LIBFLAGS += -L$(USERVER_DIR)/lib -luserver
EXE_SEARCH_PATH += $(USERVER_DIR)/bin 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)) XCHANGE_VERSION = $(call version,$(XCHANGE_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)xchange-run = $(XCHANGE_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)xchange-devel = $(XCHANGE_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi PREREQ_BUILD += valdi
INCLUDE += -I$(XCHANGE_DIR)/include INCLUDE += -I$(XCHANGE_DIR)/include
LIBFLAGS += -L$(XCHANGE_DIR)/lib -lxchange 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)) NTV2_VERSION = $(call version,$(NTV2_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ntv2-run = $(NTV2_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ntv2-run = $(NTV2_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ntv2-devel = $(NTV2_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ntv2-devel = $(NTV2_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(NTV2_DIR)/include INCLUDE += -I$(NTV2_DIR)/include
LIBFLAGS += -L$(NTV2_DIR)/lib -lntv2 LIBFLAGS += -L$(NTV2_DIR)/lib -lntv2
EXE_SEARCH_PATH += $(NTV2_DIR)/bin 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)) BTOOLS_VERSION = $(call version,$(BTOOLS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-btools-run = $(BTOOLS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-btools-devel = $(BTOOLS_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(BTOOLS_DIR)/include INCLUDE += -I$(BTOOLS_DIR)/include
LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools LIBFLAGS += -L$(BTOOLS_DIR)/lib -ldspider-btools
EXE_SEARCH_PATH += $(BTOOLS_DIR)/bin 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)) JACKJART_VERSION = $(call version,$(JACKJART_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackjart-run = $(JACKJART_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackjart-devel = $(JACKJART_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKJART_DIR)/include INCLUDE += -I$(JACKJART_DIR)/include
LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart LIBFLAGS += -L$(JACKJART_DIR)/lib -ldspider-jackjart
EXE_SEARCH_PATH += $(JACKJART_DIR)/bin 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)) JACKRTAI_VERSION = $(call version,$(JACKRTAI_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jackrtai-run = $(JACKRTAI_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jackrtai-devel = $(JACKRTAI_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKRTAI_DIR)/include INCLUDE += -I$(JACKRTAI_DIR)/include
LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai LIBFLAGS += -L$(JACKRTAI_DIR)/lib -ldspider-jackrtai
EXE_SEARCH_PATH += $(JACKRTAI_DIR)/bin 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)) JACKDUMMY_VERSION = $(call version,$(JACKDUMMY_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackdummy-run = $(JACKDUMMY_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackdummy-devel = $(JACKDUMMY_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(JACKDUMMY_DIR)/include INCLUDE += -I$(JACKDUMMY_DIR)/include
LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy LIBFLAGS += -L$(JACKDUMMY_DIR)/lib -ldspider-jackdummy
EXE_SEARCH_PATH += $(JACKDUMMY_DIR)/bin 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)) ALSART_VERSION = $(call version,$(ALSART_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)alsart-run = $(ALSART_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)alsart-devel = $(ALSART_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(ALSART_DIR)/include INCLUDE += -I$(ALSART_DIR)/include
LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart LIBFLAGS += -L$(ALSART_DIR)/lib -lalsart
EXE_SEARCH_PATH += $(ALSART_DIR)/bin 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)) JACKMIX_VERSION = $(call version,$(JACKMIX_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-jackmix-run = $(JACKMIX_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-jackmix-devel = $(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 INCLUDE += -I$(JACKMIX_DIR)/include
LIBFLAGS += -L$(JACKMIX_DIR)/lib -ldspider-jackmix LIBFLAGS += -L$(JACKMIX_DIR)/lib -ldspider-jackmix
LD_LIB_PATH += $(JACKMIX_DIR)/dsplib 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)) SCMJM_VERSION = $(call version,$(SCMJM_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scmjm-run = $(SCMJM_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scmjm-devel = $(SCMJM_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(SCMJM_DIR)/include INCLUDE += -I$(SCMJM_DIR)/include
LIBFLAGS += -L$(SCMJM_DIR)/lib -ldspider-scmjm LIBFLAGS += -L$(SCMJM_DIR)/lib -ldspider-scmjm
LD_LIB_PATH += $(SCMJM_DIR)/dsplib 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)) SCM_VERSION = $(call version,$(SCM_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspider-scm-run = $(SCM_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspider-scm-devel = $(SCM_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(SCM_DIR)/include INCLUDE += -I$(SCM_DIR)/include
LIBFLAGS += -L$(SCM_DIR)/lib -ldspider-scm LIBFLAGS += -L$(SCM_DIR)/lib -ldspider-scm
EXE_SEARCH_PATH += $(SCM_DIR)/bin 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)) DSPFS_VERSION = $(call version,$(DSPFS_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)dspfs-run = $(DSPFS_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)dspfs-devel = $(DSPFS_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(DSPFS_DIR)/include INCLUDE += -I$(DSPFS_DIR)/include
LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs LIBFLAGS += -L$(DSPFS_DIR)/lib -ldspfs
EXE_SEARCH_PATH += $(DSPFS_DIR)/bin 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)) AUTH_VERSION = $(call version,$(AUTH_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)auth-run = $(AUTH_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)auth-devel = $(AUTH_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
PREREQ_BUILD += valdi PREREQ_BUILD += valdi
INCLUDE += -I$(AUTH_DIR)/include INCLUDE += -I$(AUTH_DIR)/include
LIBFLAGS += -L$(AUTH_DIR)/lib -lauth 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)) EMSCREN_V8_VERSION = $(call version,$(EMSCREN_V8_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-v8-run = $(EMSCREN_V8_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-v8-run = $(EMSCREN_V8_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-v8-devel = $(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 #INCLUDE += -I$(EMSCREN_V8_DIR)/include
LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib
#LIBFLAGS += -L$(EMSCREN_V8_DIR)/lib -lemscren-v8 #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)) EMSCREN_VERSION = $(call version,$(EMSCREN_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-run = $(EMSCREN_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)emscren-run = $(EMSCREN_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-devel = $(EMSCREN_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)emscren-devel = $(EMSCREN_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(EMSCREN_DIR)/include INCLUDE += -I$(EMSCREN_DIR)/include
LIBFLAGS += -L$(EMSCREN_DIR)/lib LIBFLAGS += -L$(EMSCREN_DIR)/lib
LIBFLAGS += -L$(EMSCREN_DIR)/lib -lemscren 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)) VALDI_VERSION = $(call version,$(VALDI_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)valdi-run = $(VALDI_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)valdi-devel = $(VALDI_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
#INCLUDE += -I$(VALDI_DIR)/include #INCLUDE += -I$(VALDI_DIR)/include
LIBFLAGS += -L$(VALDI_DIR)/lib LIBFLAGS += -L$(VALDI_DIR)/lib
#LIBFLAGS += -L$(VALDI_DIR)/lib -lvaldi #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) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)feedfs-cmd-devel = $(FEEDFS_CMD_VERSION)
PREREQ_BUILD += feedfs-objects PREREQ_BUILD += feedfs-objects
PREREQ_BUILD += feedfs-utils PREREQ_BUILD += feedfs-utils
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FEEDFS_CMD_DIR)/include INCLUDE += -I$(FEEDFS_CMD_DIR)/include
#LIBFLAGS += -L$(FEEDFS_CMD_DIR)/lib -lfeedfs-cmd #LIBFLAGS += -L$(FEEDFS_CMD_DIR)/lib -lfeedfs-cmd
LIBFLAGS += -L$(FEEDFS_CMD_DIR)/lib 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)) SHELL_VERSION = $(call version,$(SHELL_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)shell-run = $(SHELL_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)shell-run = $(SHELL_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)shell-devel = $(SHELL_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)shell-devel = $(SHELL_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(SHELL_DIR)/include INCLUDE += -I$(SHELL_DIR)/include
LIBFLAGS += -L$(SHELL_DIR)/lib -lshell LIBFLAGS += -L$(SHELL_DIR)/lib -lshell
EXE_SEARCH_PATH += $(SHELL_DIR)/bin 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)) FPTEST_VERSION = $(call version,$(FPTEST_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fptest-run = $(FPTEST_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fptest-devel = $(FPTEST_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FPTEST_DIR)/include INCLUDE += -I$(FPTEST_DIR)/include
LIBFLAGS += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit LIBFLAGS += -L$(FPTEST_DIR)/lib -lfptest -L$(HOME)/opt/iowkit/lib -liowkit
EXE_SEARCH_PATH += $(FPTEST_DIR)/bin 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)) FPANEL_VERSION = $(call version,$(FPANEL_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)fpanel-run = $(FPANEL_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)fpanel-devel = $(FPANEL_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(FPANEL_DIR)/include INCLUDE += -I$(FPANEL_DIR)/include
LIBFLAGS += -L$(FPANEL_DIR)/lib -lfpanel -L$(HOME)/opt/iowkit/lib -liowkit LIBFLAGS += -L$(FPANEL_DIR)/lib -lfpanel -L$(HOME)/opt/iowkit/lib -liowkit
EXE_SEARCH_PATH += $(FPANEL_DIR)/bin 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)) DEVNET_VERSION = $(call version,$(DEVNET_DIR))
#RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION) #RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)devnet-run = $(DEVNET_VERSION)
#RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION) #RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)devnet-devel = $(DEVNET_VERSION)
PREREQ_BUILD += ytools PREREQ_BUILD += jw-build
INCLUDE += -I$(DEVNET_DIR)/include INCLUDE += -I$(DEVNET_DIR)/include
LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet LIBFLAGS += -L$(DEVNET_DIR)/lib -ldevnet
EXE_SEARCH_PATH += $(DEVNET_DIR)/bin EXE_SEARCH_PATH += $(DEVNET_DIR)/bin
PREREQ += DEVNET PREREQ += DEVNET
endif endif
ifneq ($(filter ytools,$(PREREQ_BUILD)),) ifneq ($(filter jw-build,$(PREREQ_BUILD)),)
ifneq ($(PROJECT),ytools) ifneq ($(PROJECT),jw-build)
YTOOLS_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/ytools /opt/$(FLAVOUR_PATH_PREFIX)ytools)) JW_BUILD_DIR = $(firstword $(wildcard $(CVS_PROJ_DIR)/jw-build /opt/$(FLAVOUR_PATH_PREFIX)jw-build))
else else
YTOOLS_DIR = $(TOPDIR) JW_BUILD_DIR = $(TOPDIR)
endif endif
YTOOLS_VERSION = $(call version,$(YTOOLS_DIR)) JW_BUILD_VERSION = $(call version,$(JW_BUILD_DIR))
RPM_REQUIRES_DEVEL += glib2-devel RPM_REQUIRES_DEVEL += glib2-devel
ifneq ($(PROJECT),ytools) ifneq ($(PROJECT),jw-build)
RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)ytools-run = $(YTOOLS_VERSION) RPM_REQUIRES_RUN += $(FLAVOUR_PREFIX)jw-build-run = $(JW_BUILD_VERSION)
RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)ytools-devel = $(YTOOLS_VERSION) RPM_REQUIRES_DEVEL += $(FLAVOUR_PREFIX)jw-build-devel = $(JW_BUILD_VERSION)
endif endif
INCLUDE += -I$(YTOOLS_DIR)/include INCLUDE += -I$(JW_BUILD_DIR)/include
LIBFLAGS += -L$(YTOOLS_DIR)/lib -lytools LIBFLAGS += -L$(JW_BUILD_DIR)/lib -ljw-build
EXE_SEARCH_PATH += $(YTOOLS_DIR)/bin EXE_SEARCH_PATH += $(JW_BUILD_DIR)/bin
PREREQ += YTOOLS PREREQ += JW_BUILD
endif endif
ifeq ($(USE_SCOPE_CASMIX),true) ifeq ($(USE_SCOPE_CASMIX),true)

8
make/proj.mk
View file

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

17
make/project.conf
View file

@ -1,17 +1,8 @@
[summary] [summary]
janware GmbH LGPL project library janware GmbH software build system
[description] [description]
A library providing A library providing an open software build an packaging system.
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
[global] [global]
group = System/Libraries group = System/Libraries
@ -19,13 +10,11 @@ subpackages = run devel
license = LGPL 2 license = LGPL 2
[pkg.required.os] [pkg.required.os]
build = cvs, make, gcc, automake, autoconf, inkscape build = cvs, make, automake, autoconf
[pkg.required.suse] [pkg.required.suse]
build = glib2-devel, boost-devel
release = rpmbuild release = rpmbuild
[pkg.required.debian] [pkg.required.debian]
build = libglib2.0-dev, libboost-dev
release = devscripts, debhelper, dput, libparse-debcontrol-perl, fakeroot release = devscripts, debhelper, dput, libparse-debcontrol-perl, fakeroot

2
make/projects.mk
View file

@ -11,7 +11,7 @@ ifeq ($(DEVELOPMENT),true)
else else
PROJECTS_DIR ?= /opt PROJECTS_DIR ?= /opt
endif 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: # -- Query the build system about other projects:
PYTHON ?= /usr/bin/python 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)) INCLUDE += $(QT_LDFLAGS) $(shell pkg-config --cflags $(QT_MODULES))
CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION) CPPFLAGS += -D_QT_MAJOR_=$(QT_MAJOR_VERSION)
# ------------------------------- ytools defs # ------------------------------- jw-build defs
UIFILES += $(wildcard *.ui) UIFILES += $(wildcard *.ui)
RCCFILES += $(wildcard *.qrc) RCCFILES += $(wildcard *.qrc)

2
make/rules.mk
View file

@ -158,7 +158,7 @@ echo-modules:
@echo "JACKDUMMY : $(JACKDUMMY_DIR)" @echo "JACKDUMMY : $(JACKDUMMY_DIR)"
@echo "ALSART : $(ALSART_DIR)" @echo "ALSART : $(ALSART_DIR)"
@echo "DSPFS : $(DSPFS_DIR)" @echo "DSPFS : $(DSPFS_DIR)"
@echo "YTOOLS : $(YTOOLS_DIR)" @echo "JW_BUILD : $(JW_BUILD_DIR)"
@echo "SCOPE_CASMIX : $(SCOPE_CASMIX_DIR)" @echo "SCOPE_CASMIX : $(SCOPE_CASMIX_DIR)"
echo-include: 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 include $(MODDIR)/make/defs.mk
MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1 SUSE_RELEASE = 10.1
UPLOAD_URL = root@ftp.jannet.de:/srv/ftp/pub/packages/linux/suse/$(SUSE_RELEASE)/inst-source/setup/descr 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_STYLE ?= de_technical
TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE) TEX_TMPL_DIR ?= $(TEX_TMPL_BASE_DIR)/$(TEX_TMPL_STYLE)
IMPORTED_TEMPLATES ?= $(shell ls $(TEX_TMPL_DIR)/*.tmpl) 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_PDF ?= logo-janware.pdf
FRONTLOGO_EPS ?= janware-frontpage-top-right.png FRONTLOGO_EPS ?= janware-frontpage-top-right.png
FRONTLOGO_WEB ?= 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 remote set-url --push origin $(REMOTE_GIT_URL)
git-clone-to-remote: 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 remote set-url --push origin $(REMOTE_GIT_URL)
git push --set-upstream origin master git push --set-upstream origin master
git push --all $(REMOTE_GIT_URL) git push --all $(REMOTE_GIT_URL)

37
scripts/Makefile
View file

@ -1,41 +1,8 @@
######################################################################## TOPDIR = ..
# #
# development utilities #
# (c) 2001 jannet it services #
# Authors: Jan Lindemann #
# contact@jannet.de #
# patches, bugfixes and comments are welcome at patch@jannet.de #
# #
# $Id$
# #
# This program is free software; permission to use, copy, modify, #
# distribute, and sell this software and its documentation under the #
# terms of the GNU Public license as published by the Free Software #
# Foundation, either version 2 or any later version of the license, is #
# hereby granted without fee, provided that (i) the above copyright #
# notices and this permission notice appear in all copies of the #
# software and related documentation, and (ii) the name of jannet may #
# not be used in any advertising or publicity relating to the software #
# without the specific, prior written permission of jannet. #
# #
# This program is distributed in the hope that it will be useful, but #
# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN- #
# TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General #
# Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program; if not, write to the Free Software Founda- #
# tion, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. #
# #
########################################################################
TOPDIR = ../..
include $(TOPDIR)/make/proj.mk include $(TOPDIR)/make/proj.mk
EXE_SH += cvsbuild jannet rn EXE_SH += jannet
include $(MODDIR)/make/scripts.mk include $(MODDIR)/make/scripts.mk
blah:
@echo $(BUILD_SCRIPT)

4
scripts/create-pkg-config.sh
View file

@ -4,7 +4,7 @@ try_assign_sec()
{ {
local file="$1" local file="$1"
local sec="$2" local sec="$2"
local val=`_ytools_cat_section "$file" "$sec"` local val=`_jw-build_cat_section "$file" "$sec"`
[ -n "$val" ] && eval $3=\"$val\" [ -n "$val" ] && eval $3=\"$val\"
} }
@ -106,7 +106,7 @@ shift
set +e set +e
[ -r "$project_descr_file" ] && { [ -r "$project_descr_file" ] && {
. ytools-functions.sh . jw-build-functions.sh
try_assign_sec $project_descr_file description descr try_assign_sec $project_descr_file description descr
try_assign_sec $project_descr_file summary summary try_assign_sec $project_descr_file summary summary
try_assign_sec $project_descr_file requires_run requires_run try_assign_sec $project_descr_file requires_run requires_run

2
scripts/git-srv-admin.sh
View file

@ -131,7 +131,7 @@ if [ "$user" ]; then
id=$user id=$user
else else
if [ "$SUDO_UID" ]; then if [ "$SUDO_UID" ]; then
id=`/opt/ytools/bin/getpwuid $SUDO_UID | sed '/^name *=/ !d; s/^name *= *//'` id=`/opt/jw-build/bin/getpwuid $SUDO_UID | sed '/^name *=/ !d; s/^name *= *//'`
[ "$id" ] || fatal "failed to find uid $SUDO_UID in user database" [ "$id" ] || fatal "failed to find uid $SUDO_UID in user database"
fi fi
user=$id user=$id

2
scripts/jannet
View file

@ -65,7 +65,7 @@ create_ldconfig_state()
check_ldconfig() check_ldconfig()
{ {
local state=/var/log/ytools-ldconf.state local state=/var/log/jw-build-ldconf.state
[ -f $state ] && create_ldconfig_state | diff $state - >/dev/null 2>&1 && return [ -f $state ] && create_ldconfig_state | diff $state - >/dev/null 2>&1 && return
echo -n "running ldconfig ... " echo -n "running ldconfig ... "
/sbin/ldconfig /sbin/ldconfig

2
scripts/pgit.sh
View file

@ -58,7 +58,7 @@ clone()
local projects="$PGIT_CLONE_PROJECTS" local projects="$PGIT_CLONE_PROJECTS"
[ "$login" ] || login=`whoami` [ "$login" ] || login=`whoami`
[ "$fromuser" ] || fromuser=`whoami` [ "$fromuser" ] || fromuser=`whoami`
local git_srv_admin="$SSH $login@git.jannet.de /opt/ytools/bin/git-srv-admin.sh" local git_srv_admin="$SSH $login@git.jannet.de /opt/jw-build/bin/git-srv-admin.sh"
if [ -z "$projects" ]; then if [ -z "$projects" ]; then
projects=`$git_srv_admin -u $fromuser -j list-personal-projects` projects=`$git_srv_admin -u $fromuser -j list-personal-projects`
[ "$?" != 0 ] && exit 1 [ "$?" != 0 ] && exit 1

2
scripts/projects.py
View file

@ -42,7 +42,7 @@ def remove_duplicates(seq):
return [x for x in seq if not (x in seen or seen_add(x))] return [x for x in seq if not (x in seen or seen_add(x))]
def get_os(args = ""): def get_os(args = ""):
for d in [ projs_root + '/ytools/devutil/scripts', '/opt/ytools/bin' ]: for d in [ projs_root + '/jw-build/devutil/scripts', '/opt/jw-build/bin' ]:
script = d + '/get_os.sh' script = d + '/get_os.sh'
if isfile(script): if isfile(script):
cmd = '/bin/bash ' + script cmd = '/bin/bash ' + script