mirror of
https://github.com/pocoproject/poco.git
synced 2025-05-11 02:30:44 +02:00
latest sources from main repository
This commit is contained in:
parent
db38afabd5
commit
aaea87c6e2
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/rules/compile#7 $
|
# $Id: //poco/Main/build/rules/compile#8 $
|
||||||
#
|
#
|
||||||
# compiile
|
# compiile
|
||||||
#
|
#
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/rules/dylib#9 $
|
# $Id: //poco/Main/build/rules/dylib#10 $
|
||||||
#
|
#
|
||||||
# dylib
|
# dylib
|
||||||
#
|
#
|
||||||
@ -54,18 +54,22 @@ shared_release: bindirs $(DYLIB_RELEASE)
|
|||||||
$(DYLIB_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
$(DYLIB_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
||||||
@echo "** Building dynamic library (debug)" $@
|
@echo "** Building dynamic library (debug)" $@
|
||||||
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(DYLIB_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
$(DYLIB_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
||||||
@echo "** Building dynamic library (release)" $@
|
@echo "** Building dynamic library (release)" $@
|
||||||
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(DYLIB_S_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
$(DYLIB_S_DEBUG): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
||||||
@echo "** Building dynamic library (debug)" $@
|
@echo "** Building dynamic library (debug)" $@
|
||||||
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(DYLIB_S_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
$(DYLIB_S_RELEASE): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
||||||
@echo "** Building dynamic library (release)" $@
|
@echo "** Building dynamic library (release)" $@
|
||||||
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
$(DYLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Include the automatically generated dependency files
|
# Include the automatically generated dependency files
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/rules/exec#9 $
|
# $Id: //poco/Main/build/rules/exec#10 $
|
||||||
#
|
#
|
||||||
# exec
|
# exec
|
||||||
#
|
#
|
||||||
@ -39,20 +39,24 @@ $(EXEC_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o)
|
|||||||
$(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
$(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
||||||
$(CPYDBG)
|
$(CPYDBG)
|
||||||
$(STRIPDBGCMD)
|
$(STRIPDBGCMD)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(EXEC_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o)
|
$(EXEC_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o)
|
||||||
@echo "** Building executable (release)" $@
|
@echo "** Building executable (release)" $@
|
||||||
$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(STATICOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
||||||
$(STRIPCMD)
|
$(STRIPCMD)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
$(EXEC_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
||||||
@echo "** Building shared executable (debug)" $@
|
@echo "** Building shared executable (debug)" $@
|
||||||
$(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
$(LINK) $(LINKFLAGS) $(DEBUGOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(EXEC_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
$(EXEC_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
||||||
@echo "** Building shared executable (release)" $@
|
@echo "** Building shared executable (release)" $@
|
||||||
$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
$(LINK) $(LINKFLAGS) $(RELEASEOPT_LINK) $(SHAREDOPT_LINK) -o $@ $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
||||||
$(STRIPCMD)
|
$(STRIPCMD)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Include the automatically generated dependency files
|
# Include the automatically generated dependency files
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/rules/global#18 $
|
# $Id: //poco/Main/build/rules/global#20 $
|
||||||
#
|
#
|
||||||
# global
|
# global
|
||||||
#
|
#
|
||||||
@ -27,12 +27,21 @@ endif
|
|||||||
#
|
#
|
||||||
sinclude $(POCO_BASE)/config.build
|
sinclude $(POCO_BASE)/config.build
|
||||||
|
|
||||||
|
#
|
||||||
|
# Check for PROJECT_BASE
|
||||||
|
#
|
||||||
|
ifndef PROJECT_BASE
|
||||||
|
PROJECT_BASE = $(POCO_BASE)
|
||||||
|
endif
|
||||||
|
export PROJECT_BASE
|
||||||
|
|
||||||
#
|
#
|
||||||
# Check for POCO_BUILD
|
# Check for POCO_BUILD
|
||||||
#
|
#
|
||||||
ifndef POCO_BUILD
|
ifndef POCO_BUILD
|
||||||
POCO_BUILD = $(POCO_BASE)
|
POCO_BUILD = $(PROJECT_BASE)
|
||||||
endif
|
endif
|
||||||
|
export POCO_BUILD
|
||||||
|
|
||||||
#
|
#
|
||||||
# Determine OS
|
# Determine OS
|
||||||
@ -85,7 +94,7 @@ HOSTNAME := $(shell hostname)
|
|||||||
#
|
#
|
||||||
# Find out current component
|
# Find out current component
|
||||||
#
|
#
|
||||||
COMPONENT := $(shell $(POCO_BASE)/build/script/projname)
|
COMPONENT := $(shell $(POCO_BASE)/build/script/projname "$(PROJECT_BASE)")
|
||||||
|
|
||||||
#
|
#
|
||||||
# Define standard directories
|
# Define standard directories
|
||||||
@ -101,6 +110,12 @@ BINPATH = $(POCO_BUILD)/$(COMPONENT)/$(BINDIR)
|
|||||||
OBJPATH = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
|
OBJPATH = $(POCO_BUILD)/$(COMPONENT)/$(OBJDIR)
|
||||||
DEPPATH = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
|
DEPPATH = $(POCO_BUILD)/$(COMPONENT)/$(DEPDIR)
|
||||||
|
|
||||||
|
ifeq ($(POCO_BASE),$(PROJECT_BASE))
|
||||||
|
POCO_LIBRARY =
|
||||||
|
else
|
||||||
|
POCO_LIBRARY = -L$(POCO_BASE)/$(LIBDIR)
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef LIBPREFIX
|
ifndef LIBPREFIX
|
||||||
LIBPREFIX = lib
|
LIBPREFIX = lib
|
||||||
endif
|
endif
|
||||||
@ -166,7 +181,7 @@ INCLUDE = -Iinclude $(foreach p,$(COMPONENTS),-I$(POCO_BASE)/$(p)/$(INCDIR))
|
|||||||
#
|
#
|
||||||
# Build Library Directory List
|
# Build Library Directory List
|
||||||
#
|
#
|
||||||
LIBRARY = -L$(LIBPATH)
|
LIBRARY = -L$(LIBPATH) $(POCO_LIBRARY)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Strip Command definition
|
# Strip Command definition
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/rules/lib#10 $
|
# $Id: //poco/Main/build/rules/lib#11 $
|
||||||
#
|
#
|
||||||
# lib
|
# lib
|
||||||
#
|
#
|
||||||
@ -50,22 +50,26 @@ $(LIB_DEBUG_STATIC): $(foreach o,$(objects),$(OBJPATH_DEBUG_STATIC)/$(o).o)
|
|||||||
@echo "** Building library (debug)" $@
|
@echo "** Building library (debug)" $@
|
||||||
$(LIB) $@ $^
|
$(LIB) $@ $^
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(LIB_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o)
|
$(LIB_RELEASE_STATIC): $(foreach o,$(objects),$(OBJPATH_RELEASE_STATIC)/$(o).o)
|
||||||
@echo "** Building library (release)" $@
|
@echo "** Building library (release)" $@
|
||||||
$(LIB) $@ $^
|
$(LIB) $@ $^
|
||||||
$(RANLIB) $@
|
$(RANLIB) $@
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(LIB_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
$(LIB_DEBUG_SHARED): $(foreach o,$(objects),$(OBJPATH_DEBUG_SHARED)/$(o).o)
|
||||||
@echo "** Building shared library (debug)" $@
|
@echo "** Building shared library (debug)" $@
|
||||||
$(SHLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
$(SHLIB) $^ $(LIBRARY) $(TARGET_LIBS_DEBUG) $(SYSLIBS)
|
||||||
$(SHLIBLN) $(LIB_DEBUG_SHARED) $(LIB_DEBUG_SHARED_LINK)
|
$(SHLIBLN) $(LIB_DEBUG_SHARED) $(LIB_DEBUG_SHARED_LINK)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
$(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
$(LIB_RELEASE_SHARED): $(foreach o,$(objects),$(OBJPATH_RELEASE_SHARED)/$(o).o)
|
||||||
@echo "** Building shared library (release)" $@
|
@echo "** Building shared library (release)" $@
|
||||||
$(SHLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
$(SHLIB) $^ $(LIBRARY) $(TARGET_LIBS_RELEASE) $(SYSLIBS)
|
||||||
$(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
|
$(SHLIBLN) $(LIB_RELEASE_SHARED) $(LIB_RELEASE_SHARED_LINK)
|
||||||
$(STRIPCMD)
|
$(STRIPCMD)
|
||||||
|
$(postbuild)
|
||||||
|
|
||||||
#
|
#
|
||||||
# Include the automatically generated dependency files
|
# Include the automatically generated dependency files
|
||||||
|
@ -1,16 +1,19 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
#
|
#
|
||||||
# $Id: //poco/Main/build/script/projname#7 $
|
# $Id: //poco/Main/build/script/projname#8 $
|
||||||
#
|
#
|
||||||
# projname
|
# projname
|
||||||
#
|
#
|
||||||
|
# Usage: projname PROJECT_BASE
|
||||||
|
#
|
||||||
# Extract the project name from the current path
|
# Extract the project name from the current path
|
||||||
# NOTE: the cd $POCO_BASE is necessary to resolve symbolic links,
|
# NOTE: the cd $PROJECT_BASE is necessary to resolve symbolic links,
|
||||||
# ditto is the kinda strange sh -c pwd
|
# ditto is the kinda strange sh -c pwd
|
||||||
#
|
#
|
||||||
|
|
||||||
|
PROJECT_BASE=$1
|
||||||
cdir=`sh -c pwd`
|
cdir=`sh -c pwd`
|
||||||
cd $POCO_BASE
|
cd $PROJECT_BASE
|
||||||
pocobase=`sh -c pwd`
|
projbase=`sh -c pwd`
|
||||||
cd "$cdir"
|
cd "$cdir"
|
||||||
sh -c pwd | sed "s:^$pocobase::" | sed "s:^/::"
|
sh -c pwd | sed "s:^$projbase::" | sed "s:^/::"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user