firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Fixed CORE-5654: Mixed intermediate build files for plugins examples

Browse Source
This commit is contained in:
AlexPeshkoff 2017-11-03 14:43:17 +03:00
parent 7b0c03512a
commit f418336819
5 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/posix/Makefile.in
View File

@ -270,7 +270,7 @@ cross2:
$(MAKE) utilities $(MAKE) utilities
$(MAKE) $(GPRE) $(MAKE) $(GPRE)
$(MAKE) plugins $(MAKE) plugins
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/ $(MAKE) -f Makefile.plugins_examples
$(MAKE) cross_rest $(MAKE) cross_rest
#___________________________________________________________________________ #___________________________________________________________________________
@ -590,7 +590,7 @@ $(QLI): $(QLI_Objects) $(COMMON_LIB)
examples: include_generic examples: include_generic
$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/ $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
$(MAKE) -f Makefile.plugins_examples -C $(GEN_ROOT)/examples/ $(MAKE) -f Makefile.plugins_examples
message_file: $(FIREBIRD_MSG) message_file: $(FIREBIRD_MSG)

11
builds/posix/Makefile.in.plugins_examples
View File

@ -28,7 +28,7 @@
# Adriano dos Santos Fernandes # Adriano dos Santos Fernandes
# #
ROOT=$(shell cd ../..; pwd) ROOT=$(shell cd ..; pwd)
ifeq ($(IsDeveloper), Y) ifeq ($(IsDeveloper), Y)
DefaultTarget := Debug DefaultTarget := Debug
@ -50,19 +50,12 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@
# Override make.defaults
LINK_PLUGIN_SYMBOLS = $(call LIB_LINK_MAPFILE,../$(PLUGIN_VERS))
.PHONY: all udrcpp_example dc_example kh_example crypt_app .PHONY: all udrcpp_example dc_example kh_example crypt_app
all: udrcpp_example dc_example kh_example crypt_app all: udrcpp_example dc_example kh_example crypt_app
UDR_Objects = $(call makeObjects,../examples/udr,Functions.cpp) \ UDR_Objects = $(call dirObjects,../examples/udr)
$(call makeObjects,../examples/udr,Procedures.cpp) \
$(call makeObjects,../examples/udr,Triggers.cpp)
UDR_Plugin = $(PLUGINS)/udr/$(LIB_PREFIX)udrcpp_example.$(SHRLIB_EXT) UDR_Plugin = $(PLUGINS)/udr/$(LIB_PREFIX)udrcpp_example.$(SHRLIB_EXT)
AllObjects = $(UDR_Objects) AllObjects = $(UDR_Objects)

4
builds/posix/make.rules
View File

@ -110,6 +110,10 @@ $(OBJ)/%.o: $(SRC_ROOT)/%.cpp
$(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@ $(CXX) $(WCXXFLAGS) -c $(firstword $<) -o $@
@sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@) @sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@)
$(OBJ)/%.o: $(ROOT)/%.cpp
$(CC) $(WCFLAGS) -c $(firstword $<) -o $@
@sed $(INLINE_EDIT_SED) -e "1,2s/:/: \$$(wildcard/" -e "\$$s/\(.*\)/\\1)/" $(patsubst %.o,%.d,$@)
.SUFFIXES: .epp .e .SUFFIXES: .epp .e
# Rules for making resource files # Rules for making resource files

2
builds/posix/make.shared.variables
View File

@ -1,6 +1,6 @@
# Helper functions # Helper functions
doObjects= $(patsubst %.y,%.o,$(patsubst %.epp,%.o,$(patsubst %.c,%.o,$(1:.cpp=.o)))) doObjects= $(patsubst %.y,%.o,$(patsubst %.epp,%.o,$(patsubst %.c,%.o,$(1:.cpp=.o))))
makeObjects= $(addprefix $(OBJ)/$(1)/,$(call doObjects,$2)) makeObjects= $(addprefix $(OBJ)/$(patsubst ../%,%,$(1))/,$(call doObjects,$2))
dirFiles= $(sort $(notdir $(wildcard ../src/$(1)/*.cpp)) $(notdir $(wildcard ../src/$(1)/*.c)) \ dirFiles= $(sort $(notdir $(wildcard ../src/$(1)/*.cpp)) $(notdir $(wildcard ../src/$(1)/*.c)) \
$(notdir $(wildcard ../src/$(1)/*.epp)) $(notdir $(wildcard ../src/$(1)/*.y))) $(notdir $(wildcard ../src/$(1)/*.epp)) $(notdir $(wildcard ../src/$(1)/*.y)))
dirInPath= $(call makeObjects,$(1),$(call dirFiles,$(1))) dirInPath= $(call makeObjects,$(1),$(call dirFiles,$(1)))

10
configure.ac
View File

@ -1232,6 +1232,10 @@ dnl ### TEMP ### directories for generated .cpp, .o and .d by module name
mkdir -p temp/\$fb_tgt/\$src_dir mkdir -p temp/\$fb_tgt/\$src_dir
done done
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do
mkdir -p temp/\$fb_tgt/\$src_dir
done
src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version src/misc/writeBuildNum.sh createMakeVersion gen/Make.Version
dnl # sql files for UDF declarations dnl # sql files for UDF declarations
@ -1240,10 +1244,6 @@ dnl # sql files for UDF declarations
done done
done done
for src_dir in `ls -R -1 examples | grep : | tr -d : | tr "\n" " "`; do
mkdir -p temp/\$src_dir
done
dnl # rebuild version header if needed dnl # rebuild version header if needed
./src/misc/writeBuildNum.sh rebuildHeader ./src/misc/writeBuildNum.sh rebuildHeader
@ -1393,7 +1393,7 @@ gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables
gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets
gen/Makefile:${MAKE_SRC_DIR}/Makefile.in gen/Makefile:${MAKE_SRC_DIR}/Makefile.in
gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples
gen/examples/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples gen/Makefile.plugins_examples:${MAKE_SRC_DIR}/Makefile.in.plugins_examples
gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in gen/Makefile.install:builds/install/arch-specific/${INSTALL_PREFIX}/Makefile.in
Makefile:Makefile.in Makefile:Makefile.in
) )